From 5ac3cab3bc6a877c59719cc4b4de758444ea4dd8 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期一, 07 四月 2025 15:12:12 +0800
Subject: [PATCH] Merge branch 'radio_frequency' of http://114.132.189.42:9002/r/lims-ruoyi-after into radio_frequency
---
basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductListUpdateRecord.java | 195 ++++--------------------------------------------
1 files changed, 18 insertions(+), 177 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductListUpdateRecord.java b/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductListUpdateRecord.java
index 6b3bce8..5d0e284 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductListUpdateRecord.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductListUpdateRecord.java
@@ -11,12 +11,13 @@
import java.time.LocalDateTime;
/**
- * 鏍囧噯鏍戜笅鐨勬楠岄」鐩�
- * @TableName standard_product_list
+ * 鏍囧噯鏍戜笅鐨勬楠岄」鐩慨鏀硅褰�
+ * @TableName standard_product_list_update_record
*/
-@TableName(value ="standard_product_list_backup_rel")
+@TableName(value ="standard_product_list_update_record")
@Data
public class StandardProductListUpdateRecord implements Serializable {
+
/**
* 涓婚敭id
*/
@@ -24,141 +25,11 @@
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
- /**
- * 妫�楠岄」
- */
- @ApiModelProperty("妫�楠岄」")
- private String inspectionItem;
- @ApiModelProperty("妫�楠岄」EN")
- private String inspectionItemEn;
-
- /**
- * 妫�楠岄」灏忕被
- */
- @ApiModelProperty("妫�楠岄」灏忕被")
- private String inspectionItemSubclass;
-
- @ApiModelProperty("妫�楠岄」灏忕被EN")
- private String inspectionItemSubclassEn;
-
- /**
- * 瀹為獙瀹�
- */
- @ApiModelProperty("瀹為獙瀹�")
- private String laboratory;
-
- @ApiModelProperty("瀛愬疄楠屽")
- private String sonLaboratory;
-
- /**
- * 璁￠噺鍗曚綅
- */
- @ApiModelProperty("璁￠噺鍗曚綅")
- private String unit;
-
- /**
- * 鍗曚环(鍏�)
- */
- @ApiModelProperty("鍗曚环")
- private String price;
-
- /**
- * 宸ユ椂(H)
- */
- @ApiModelProperty("宸ユ椂")
- private String manHour;
-
- /**
- * 宸ユ椂鍒嗙粍
- */
- @ApiModelProperty("宸ユ椂鍒嗙粍")
- private String manHourGroup;
-
- /**
- * 妫�楠岄」绫诲瀷
- */
- @ApiModelProperty("妫�楠岄」绫诲瀷")
- private String inspectionItemType;
-
- /**
- * 妫�楠屽�肩被鍨�
- */
- @ApiModelProperty("妫�楠屽�肩被鍨�")
- private String inspectionValueType;
-
- /**
- * 妫�楠屾鏁�
- */
- @ApiModelProperty("妫�楠屾鏁�")
- private Integer checkoutNumber;
-
- /**
- * 鍖洪棿
- */
- @ApiModelProperty("鍖洪棿")
- private String section;
-
- /**
- * 鍖洪棿
- */
- @ApiModelProperty("鑺暟鍖洪棿")
- private String cores;
-
- /**
- * 鏂规硶
- */
- @ApiModelProperty("鏂规硶鍒楄〃")
- private String method;
-
- @ApiModelProperty("鏂规硶")
- private String methodS;
-
- /**
- * 棰勮鏃堕棿(澶�)
- */
- @ApiModelProperty("棰勮鏃堕棿")
- private Integer manDay;
-
- /**
- * 鐗规畩鏍囪瘑
- */
- @ApiModelProperty("鐗规畩鏍囪瘑")
- private String bsm;
-
- /**
- * 瑕佹眰鍊�
- */
- @ApiModelProperty("瑕佹眰鍊�")
- private String ask;
-
- @ApiModelProperty("瑕佹眰鎻忚堪")
- private String tell;
-
- /**
- * 澶栭敭锛氭爣鍑嗘柟娉昳d
- */
- @ApiModelProperty("鏍囧噯鏂规硶id")
- private Integer standardMethodListId;
-
- @ApiModelProperty("宸ュ巶")
- private String factory;
-
- @ApiModelProperty("鏍峰搧鍒嗙被")
- private String sampleType;
-
- @ApiModelProperty("鏍峰搧")
- private String sample;
-
- @ApiModelProperty("鍨嬪彿")
- private String model;
-
- @ApiModelProperty("妯℃澘id")
- private Integer templateId;
-
- @ApiModelProperty("")
+ @ApiModelProperty("鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
+
/**
*
*/
@@ -166,10 +37,11 @@
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
+
/**
*
*/
- @ApiModelProperty("")
+ @ApiModelProperty("淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
/**
@@ -180,49 +52,18 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
- @ApiModelProperty("1锛氭湁鏁� 0锛氭棤鏁�")
- private Integer state;
+ @ApiModelProperty("瀹℃牳鐘舵�� 1 瀹℃牳涓� 2 瀹℃牳閫氳繃 3 瀹℃牳鏈�氳繃")
+ private String checkStatus;
- private String dic;
+ @ApiModelProperty("澶囨敞")
+ private String remark;
- private String tree;
+ @ApiModelProperty("鏂囦欢璺緞")
+ private String filePath;
- @ApiModelProperty("妫�楠岄」id")
- private Integer structureItemParameterId;
+ @ApiModelProperty("鏂囦欢鍚嶇О")
+ private String fileName;
- @ApiModelProperty(value = "妫�楠岄」鍒嗙被")
- private String inspectionItemClass;
-
- @ApiModelProperty(value = "妫�楠岄」鍒嗙被EN")
- private String inspectionItemClassEn;
-
- @ApiModelProperty(value = "鏉′欢")
- private String radius;
-
- @ApiModelProperty(value = "鏉′欢鍒楄〃")
- private String radiusList;
-
- @ApiModelProperty(value = "鏀惰垂鏍囧噯(鍏�/娆�)")
- private String rates;
-
- @ApiModelProperty(value = "绱㈠紩椤哄簭")
- private Integer sort;
-
- /**
- * 瀵间綋鏉愯川
- */
- @ApiModelProperty("瀵间綋鏉愯川")
- private String conductorMaterial;
-
- /**
- * 瀵间綋绫诲瀷
- */
- @ApiModelProperty("瀵间綋绫诲瀷")
- private String conductorType;
-
- @ApiModelProperty("鏍囧噯鏍戜笅妫�楠岄」鐩〃ID")
- private Long standardProductListId;
-
- @ApiModelProperty("鎿嶄綔璁板綍 0 淇敼 1 瀹℃牳閫氳繃 2 瀹℃牳鏈�氳繃")
- private String operationType;
+ @ApiModelProperty("鏂囦欢棰勮鍦板潃")
+ private String filePreviewPath;
}
--
Gitblit v1.9.3