From f1d445b9d51abb020cbcd4a61b4edd36fbe75216 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 26 八月 2023 15:57:38 +0800
Subject: [PATCH] 新增检验修改
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/RawMaterial.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/RawMaterial.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/RawMaterial.java
index 372dd04..04a0f4b 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/RawMaterial.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/RawMaterial.java
@@ -22,7 +22,7 @@
*/
@Data
@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="RawMaterial瀵硅薄", description="")
+@ApiModel(value = "RawMaterial瀵硅薄", description = "")
public class RawMaterial implements Serializable {
private static final long serialVersionUID = 1L;
@@ -51,19 +51,19 @@
@ApiModelProperty(value = "鎶ユ鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
- private LocalDateTime inspectionDate;
+ private Date inspectionDate;
@ApiModelProperty(value = "妫�楠屼汉")
private String surveyor;
@ApiModelProperty(value = "妫�楠屾棩鏈�")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
- private LocalDateTime dateSurvey;
+ private Date dateSurvey;
@ApiModelProperty(value = "鐘舵��0:寰呮娴�;1:宸叉娴�")
- private Integer condition;
+ private Integer type;
-// @TableLogic(value = "1", delval = "0")
+ // @TableLogic(value = "1", delval = "0")
@ApiModelProperty(value = "閫昏緫鍒犻櫎 姝ｅ父>=1,鍒犻櫎<=0", hidden = true)
private Integer state;
@@ -73,8 +73,8 @@
private Date createTime;
@TableField(fill = FieldFill.INSERT_UPDATE)
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(value = "鏇存柊鏃堕棿", hidden = true)
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date updateTime;
@ApiModelProperty(value = "涔愯閿�", hidden = true)
--
Gitblit v1.9.3