From 4497f5b1e322eba5ec519ebc1955317ed656aa8e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 26 十二月 2024 14:31:15 +0800
Subject: [PATCH] Merge branch 'master' into cnas

---
 inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSample.java |   87 +++++++++++++++++++------------------------
 1 files changed, 39 insertions(+), 48 deletions(-)

diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSample.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSample.java
index bf057a2..496675c 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSample.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSample.java
@@ -1,14 +1,12 @@
 package com.yuanchu.mom.pojo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * 妫�楠屾牱鍝�
@@ -44,6 +42,11 @@
     private String joinName;
 
     /**
+     * 閰嶅鏍峰搧鏁伴噺
+     */
+    private Integer joinNum;
+
+    /**
      * 鏍峰搧缂栫爜
      */
     private String sampleCode;
@@ -74,64 +77,52 @@
     private String model;
 
     /**
-     * 鏄惁鐣欐牱 1锛氱暀鏍� 0锛氫笉鐣欐牱
-     */
-    private Integer isLeave;
-
-    /**
-     * 鐣欐牱鏁伴噺
-     */
-    private Integer leaveNum;
-
-    /**
-     * 妫�娴嬭繘搴�
-
-     */
-    private String insProgress;
-
-    /**
      * 妫�楠岀姸鎬�(0锛氬緟妫�楠�1:妫�楠屼腑 2:宸叉楠�3锛氬緟澶嶆牳4锛氬鏍告湭閫氳繃5锛氬鏍搁�氳繃)
      */
     private Integer insState;
-
-    /**
-     * 涓嬪彂鏃堕棿
-     */
-    private Date sendTime;
-
-    /**
-     * 閰嶅鏍峰搧鏁伴噺
-     */
-    private Integer joinNum;
 
     /**
      * 澶囨敞
      */
     private String remark;
 
-    /**
-     * 绾﹀畾鏃堕棿
-     */
-    private Date appointed;
+    private String standardMethodListId;
 
-    /**
-     * 
-     */
+    @ApiModelProperty("鏍峰搧鍗曚綅")
+    private String unit;
+
+    private Integer cellId;
+
+    @TableField(fill = FieldFill.INSERT)
     private Integer createUser;
 
-    /**
-     * 
-     */
-    private Integer updateUser;
-
-    /**
-     * 
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty("鍒涘缓鏃堕棿")
+    @TableField(fill = FieldFill.INSERT)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
 
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Integer updateUser;
+
+    @ApiModelProperty("淇敼鏃堕棿")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime updateTime;
+
+    private Integer parentId;
+
+    @TableField(select = false,exist = false)
+    private Integer num=1;
+
+    @ApiModelProperty("璇曢獙瑕佹眰:绉诲姩,鑱旈��,鐢典俊")
+    private String testRequirements;
+
     /**
-     * 
+     * 鐢垫満缂栧彿
      */
-    private Date updateTime;
+    private String motorNumber;
+
+    @TableField(exist = false,select = false)
+    private String entrustCode;
+
 }
\ No newline at end of file

--
Gitblit v1.9.3