From 5d86ffe662c0472a96bcccee2da307461c115de0 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 29 八月 2023 17:55:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProduct.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProduct.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProduct.java
index 978a274..64d49bb 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProduct.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProduct.java
@@ -66,17 +66,13 @@
**/
private Integer state;
- /**
- * ${column.comment}
- **/
+
@TableField(fill = FieldFill.INSERT)
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date createTime;
- /**
- * ${column.comment}
- **/
+
@TableField(fill = FieldFill.INSERT_UPDATE)
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@@ -88,7 +84,7 @@
private Integer inspectionMaterialId;
/**
- * 鍏宠仈 鐢ㄦ埛id 璇曢獙鍛�
+ * 鍏宠仈 鐢ㄦ埛id 鎵ц浜�
**/
private Integer userId;
@@ -96,5 +92,10 @@
* 鍏宠仈 璁惧id
**/
private Integer instrumentId;
+
+ /**
+ * 鍏宠仈 鐢ㄦ埛id 璐ｄ换浜�
+ **/
+ private Integer userProId;
}
--
Gitblit v1.9.3