From a0b5291eb64b13555d4390aba7782eb76dced376 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期二, 25 二月 2025 11:18:55 +0800
Subject: [PATCH] Merge branch 'dev' into dev_cr
---
basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductList.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductList.java b/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductList.java
index 1c1b79f..fd0d620 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductList.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductList.java
@@ -153,7 +153,7 @@
@ApiModelProperty("鍨嬪彿")
private String model;
- @ApiModelProperty("鍨嬪彿")
+ @ApiModelProperty("妯℃澘id")
private Integer templateId;
@ApiModelProperty("")
@@ -187,6 +187,7 @@
private String tree;
+ @ApiModelProperty("妫�楠岄」id")
private Integer structureItemParameterId;
@ApiModelProperty(value = "妫�楠岄」鍒嗙被")
--
Gitblit v1.9.3