From eb975b40828b3a930fb38b75c739a7385b14ee12 Mon Sep 17 00:00:00 2001 From: zhuo <2089219845@qq.com> Date: 星期四, 03 四月 2025 14:48:57 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/radio_frequency' into radio_frequency --- basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductList.java | 7 ++++++- 1 files changed, 6 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..1d44755 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 = "妫�楠岄」鍒嗙被") @@ -218,4 +219,8 @@ */ @ApiModelProperty("瀵间綋绫诲瀷") private String conductorType; + + @ApiModelProperty("瀹℃牳鐘舵�� 0 鏈彁浜� 1 瀹℃牳涓� 2 瀹℃牳閫氳繃 3 瀹℃牳鏈�氳繃") + @TableField(updateStrategy = FieldStrategy.IGNORED) + private String checkStatus; } -- Gitblit v1.9.3