From 99d6db0aab044b740ce02f57872c1e38ae647b58 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 29 七月 2025 19:00:50 +0800
Subject: [PATCH] 三不原则分析 中心修改 台账导入导出字段修改

---
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcNoplanClose.java |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcNoplanClose.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcNoplanClose.java
index 69ffb27..ed7cf1d 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcNoplanClose.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcNoplanClose.java
@@ -14,6 +14,7 @@
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 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;
@@ -50,21 +51,22 @@
      */
     @Excel(name = "闈炶鍒掑仠鏈虹被鍨�", width = 15)
     @ApiModelProperty(value = "闈炶鍒掑仠鏈虹被鍨�")
+    @Dict(dicCode = "mdc_noplan_type")
     private String noplanType;
     /**
      * 闈炶鍒掑仠鏈哄紑濮嬫椂闂�
      */
-    @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")
+    @Excel(name = "闈炶鍒掑仠鏈哄紑濮嬫椂闂�", width = 20, format = "yyyy-MM-dd HH:mm")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     @ApiModelProperty(value = "闈炶鍒掑仠鏈哄紑濮嬫椂闂�")
     private Date startTime;
     /**
      * 闈炶鍒掑仠鏈虹粨鏉熸椂闂�
      */
-    @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")
+    @Excel(name = "闈炶鍒掑仠鏈虹粨鏉熸椂闂�", width = 20, format = "yyyy-MM-dd HH:mm")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     @ApiModelProperty(value = "闈炶鍒掑仠鏈虹粨鏉熸椂闂�")
     private Date endTime;
     /**

--
Gitblit v1.9.3