From 8ce50189f0b00d62390d67fd27f859ca7831616b Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 23 五月 2024 17:32:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSample.java | 53 +++++++++++++++--------------------------------------
1 files changed, 15 insertions(+), 38 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 eb0aced..a43c2b0 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,15 +1,12 @@
package com.yuanchu.mom.pojo;
import com.baomidou.mybatisplus.annotation.*;
-
-import java.io.Serializable;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.Date;
-
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
/**
* 妫�楠屾牱鍝�
@@ -45,6 +42,11 @@
private String joinName;
/**
+ * 閰嶅鏍峰搧鏁伴噺
+ */
+ private Integer joinNum;
+
+ /**
* 鏍峰搧缂栫爜
*/
private String sampleCode;
@@ -75,47 +77,21 @@
private String model;
/**
- * 鏄惁鐣欐牱 1锛氱暀鏍� 0锛氫笉鐣欐牱
- */
- private Integer isLeave;
-
- /**
- * 鐣欐牱鏁伴噺
- */
- private Integer leaveNum;
-
- /**
- * 妫�娴嬭繘搴�
- */
- private Integer insProgress;
-
- /**
* 妫�楠岀姸鎬�(0锛氬緟妫�楠�1:妫�楠屼腑 2:宸叉楠�3锛氬緟澶嶆牳4锛氬鏍告湭閫氳繃5锛氬鏍搁�氳繃)
*/
private Integer insState;
-
- /**
- * 涓嬪彂鏃堕棿
- */
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime sendTime;
-
- /**
- * 閰嶅鏍峰搧鏁伴噺
- */
- private Integer joinNum;
/**
* 澶囨敞
*/
private String remark;
- /**
- * 绾﹀畾鏃堕棿
- */
- @JsonFormat(pattern = "yyyy-MM-dd")
- private LocalDate appointed;
+ private Integer standardMethodListId;
+
+ @ApiModelProperty("鏍峰搧鍗曚綅")
+ private String unit;
+
+ private Integer cellId;
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
@@ -132,4 +108,5 @@
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
+
}
\ No newline at end of file
--
Gitblit v1.9.3