From d0a6fc23f31f924cb1744397478dc4c7c57c04e1 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 19 八月 2023 09:58:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/NonConformanceReview.java |  102 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 102 insertions(+), 0 deletions(-)

diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/NonConformanceReview.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/NonConformanceReview.java
new file mode 100644
index 0000000..71b1e6c
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/NonConformanceReview.java
@@ -0,0 +1,102 @@
+package com.yuanchu.limslaboratory.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.sql.Date;
+import java.time.LocalDateTime;
+
+/**
+ * @Author 寮犲
+ * @Date 2023/8/9
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="涓嶇鍚堝搧璇勫瀵硅薄", description="")
+@TableName("tb_non_conformance_review")
+public class NonConformanceReview implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 鏍峰搧缂栧彿
+     */
+    private String materialCode;
+
+    /**
+     * 鏍峰搧鍚嶇О
+     */
+    private String materialName;
+
+    /**
+     * 鐢宠鍗曞彿
+     */
+    private String inspectionCode;
+
+    /**
+     * 鐧昏鏃ユ湡
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date createTime;
+
+    /**
+     * 瀹為獙璐熻矗浜�
+     */
+    private String testManager;
+
+    /**
+     * 瑙勬牸鍨嬪彿
+     */
+    private String specifications;
+
+    /**
+     * 鍒涘缓浜�
+     */
+    private String createdUser;
+
+    /**
+     * 鍒涘缓鏃堕棿
+     */
+    @DateTimeFormat(
+            pattern = "yyyy-MM-dd HH:mm:ss"
+    )
+    @JsonFormat(
+            pattern = "yyyy-MM-dd HH:mm:ss"
+    )
+    private LocalDateTime createdTime;
+
+    /**
+     * 淇敼浜�
+     */
+    private String updatedUser;
+
+
+    /**
+     * 淇敼鏃堕棿
+     */
+    @DateTimeFormat(
+            pattern = "yyyy-MM-dd HH:mm:ss"
+    )
+    @JsonFormat(
+            pattern = "yyyy-MM-dd HH:mm:ss"
+    )
+    private LocalDateTime updatedTime;
+
+    /**
+     * 閫昏緫鍒犻櫎
+     */
+    @TableLogic(value = "1")
+    private Integer state;
+}

--
Gitblit v1.9.3