From d2cd1865e77dd873166543df2f2f27f183e66860 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期五, 20 十月 2023 13:56:50 +0800
Subject: [PATCH] 小修改

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/OperationCertificateDetail.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/OperationCertificateDetail.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/OperationCertificateDetail.java
index 5146352..2fa74d4 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/OperationCertificateDetail.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/OperationCertificateDetail.java
@@ -7,6 +7,7 @@
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecg.common.system.base.entity.JeecgEntity;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
@@ -27,21 +28,28 @@
 public class OperationCertificateDetail  extends JeecgEntity  implements Serializable {
     private static final long serialVersionUID = 1L;
 
-
+    @Excel(name = "鍙戠敓鏃ユ湡", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "鍙戠敓鏃ユ湡")
+    private Date happenDate;
 	/**璇佷功ID*/
     @ApiModelProperty(value = "璇佷功ID")
     private String operationCertificateId;
 	/**绫诲瀷*/
 	@Excel(name = "绫诲瀷", width = 15)
     @ApiModelProperty(value = "绫诲瀷")
+    @Dict(dicCode = "certificate_change_type")
     private String type;
 	/**璁惧id*/
 	@Excel(name = "璁惧id", width = 15)
     @ApiModelProperty(value = "璁惧id")
+    @Dict(dictTable = "mom_eam_equipment", dicText = "num", dicCode = "id")
     private String equipmentId;
 	/**鎵e垎椤�*/
 	@Excel(name = "鎵e垎椤�", width = 15)
     @ApiModelProperty(value = "鎵e垎椤�")
+    @Dict(dictTable = "mom_eam_base_deduction_item", dicText = "content", dicCode = "id")
     private String deductionItem;
 	/**鎵e垎鍛ㄦ湡*/
 	@Excel(name = "鎵e垎鍛ㄦ湡", width = 15)

--
Gitblit v1.9.3