From 99755eea33cf009c36507df468c244f3be5b34c9 Mon Sep 17 00:00:00 2001 From: chenrui <1187576398@qq.com> Date: 星期五, 28 二月 2025 17:27:31 +0800 Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-after 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