From f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 13 三月 2025 10:46:24 +0800
Subject: [PATCH] 分支合并冲突解决
---
basic-server/src/main/java/com/ruoyi/basic/pojo/StructureItemParameter.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/pojo/StructureItemParameter.java b/basic-server/src/main/java/com/ruoyi/basic/pojo/StructureItemParameter.java
index 7faa8be..223587f 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/pojo/StructureItemParameter.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/pojo/StructureItemParameter.java
@@ -36,6 +36,9 @@
@ApiModelProperty(value = "妫�楠屽璞�")
private String sample;
+ @TableField(exist = false)
+ private String samples;
+
@ApiModelProperty(value = "鍗曚环(鍏�)")
private String price;
@@ -69,8 +72,16 @@
@ApiModelProperty(value = "妫�楠岄」绫诲瀷")
private String inspectionItemType;
+ @ApiModelProperty(value = "妫�楠岄」绫诲瀷")
+ @TableField(exist = false)
+ private String inspectionItemTypeTwo;
+
@ApiModelProperty(value = "妫�楠屽�肩被鍨�")
private String inspectionValueType;
+
+ @ApiModelProperty(value = "妫�楠屽�肩被鍨�")
+ @TableField(exist = false)
+ private String inspectionValueTypeTwo;
@ApiModelProperty(value = "妫�楠屾鏁�")
private Integer checkoutNumber;
@@ -81,8 +92,16 @@
@ApiModelProperty(value = "鐗规畩鏍囪瘑")
private String bsm;
+ @ApiModelProperty(value = "鐗规畩鏍囪瘑")
+ @TableField(exist = false)
+ private String updateBsm;
+
@ApiModelProperty(value = "鍘熷璁板綍妯℃澘")
private Integer templateId;
+
+ @ApiModelProperty(value = "鍘熷璁板綍妯℃澘")
+ @TableField(exist = false)
+ private String templateName;
@ApiModelProperty(value = "鍒涘缓浜篿d")
@TableField(fill = FieldFill.INSERT)
@@ -110,12 +129,6 @@
@ApiModelProperty(value = "妫�楠岄」鍒嗙被EN")
private String inspectionItemClassEn;
-
- @ApiModelProperty(value = "鏉′欢")
- private String radiusList;
-
- @ApiModelProperty(value = "鏀惰垂鏍囧噯(鍏�/娆�)")
- private String rates;
}
--
Gitblit v1.9.3