From 7c331e84a7151c943d900b34fbd57475d69cdc27 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 24 七月 2024 17:31:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSampleUser.java | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSampleUser.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSampleUser.java
index ae76ec9..8512567 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSampleUser.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSampleUser.java
@@ -3,11 +3,14 @@
import com.baomidou.mybatisplus.annotation.*;
import java.io.Serializable;
+import java.time.LocalDateTime;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.NoArgsConstructor;
+import org.apache.poi.ss.formula.functions.T;
/**
* 鏍峰搧璐熻矗浜鸿褰�
@@ -39,25 +42,34 @@
private Integer state;
- /**
- * 鍒涘缓浜�
- */
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- /**
- * 鍒涘缓鏃堕棿
- */
+ @ApiModelProperty("鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date createTime;
+ private LocalDateTime createTime;
- @TableField(exist = false)
- private static final long serialVersionUID = 1L;
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Integer updateUser;
- public InsSampleUser(Integer insSampleId, Integer userId, Integer state) {
+ @ApiModelProperty("淇敼鏃堕棿")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime updateTime;
+
+ /**
+ * 瀛愯瘯楠屽
+ * @param insSampleId
+ * @param userId
+ * @param state
+ */
+ private String sonLaboratory;
+
+ public InsSampleUser(Integer insSampleId, Integer userId, Integer state,String sonLaboratory) {
this.insSampleId = insSampleId;
this.userId = userId;
this.state = state;
+ this.sonLaboratory = sonLaboratory;
}
}
\ No newline at end of file
--
Gitblit v1.9.3