From ad54d502450e219c38f7d9b878ae07f759ab2a23 Mon Sep 17 00:00:00 2001
From: 朱佳吉 <1527963051@qq.com>
Date: 星期二, 07 五月 2024 17:58:54 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-after
---
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSample.java | 43 +++++++++++--------------------------------
1 files changed, 11 insertions(+), 32 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..313d54c 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
@@ -45,6 +45,11 @@
private String joinName;
/**
+ * 閰嶅鏍峰搧鏁伴噺
+ */
+ private Integer joinNum;
+
+ /**
* 鏍峰搧缂栫爜
*/
private String sampleCode;
@@ -75,47 +80,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;
--
Gitblit v1.9.3