From 4337640b7ab86136baed2fd6aa959e4828a75cea Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 07 十二月 2023 17:33:51 +0800
Subject: [PATCH] 计算加工工件个数算法和密码安全策略

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyInspectionStandard.java |   41 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 41 insertions(+), 0 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyInspectionStandard.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyInspectionStandard.java
index 2f195aa..e818774 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyInspectionStandard.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyInspectionStandard.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -10,6 +11,7 @@
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.system.base.entity.JeecgEntity;
 import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.util.List;
@@ -85,6 +87,45 @@
     @ApiModelProperty(value = "鐘舵�� 0 绂佺敤 1 鍚敤")
     private String status = CommonConstant.STATUS_1;
 
+    @ApiModelProperty(value = "绛惧鐘舵�侊紙1宸茬紪鍒讹紝2椹冲洖缂栧埗锛�3宸插鏍革紝4椹冲洖瀹℃牳锛�5閫氳繃锛�")
+    private String approvalStatus;
+
+    @ApiModelProperty(value = "瀹℃牳/椹冲洖鎰忚")
+    private String auditFeedback;
+
+    @ApiModelProperty(value = "瀹℃壒/椹冲洖鎰忚")
+    private String approvalFeedback;
+
+    @ApiModelProperty(value = "缂栧埗浜�")
+    private String writePerson;
+
+    @ApiModelProperty(value = "瀹℃牳浜�")
+    private String auditPerson;
+
+    @ApiModelProperty(value = "瀹℃壒浜�")
+    private String approvalPerson;
+
+    @ApiModelProperty(value = "瀹℃壒澶辨晥浜�")
+    private String loseEfficacyPerson;
+
+    /**
+     * 鐢熸晥鏃堕棿
+     */
+    @ApiModelProperty(value = "鐢熸晥鏃堕棿")
+    @Excel(name = "鐢熸晥鏃堕棿", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private java.util.Date takeEffectTime;
+
+    /**
+     * 澶辨晥鏃堕棿
+     */
+    @ApiModelProperty(value = "澶辨晥鏃堕棿")
+    @Excel(name = "澶辨晥鏃堕棿", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private java.util.Date loseEfficacyTime;
+
     @TableField(exist = false)
     private List<DailyInspectionStandardDetail> dailyInspectionStandardDetaillist;
 

--
Gitblit v1.9.3