From b019df4914f99aeb6b6c0ff111b1c8a4424d3331 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期三, 17 五月 2023 10:36:52 +0800
Subject: [PATCH] 调整了字段顺序与前端对应,添加了发生时间

---
 zhang-content/src/main/java/com/ruoyi/domain/ZfEconomy.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZfEconomy.java b/zhang-content/src/main/java/com/ruoyi/domain/ZfEconomy.java
index 889ad2d..d77272d 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZfEconomy.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfEconomy.java
@@ -34,8 +34,8 @@
     /**
      * 0锛氬熀閲戙��1锛氬彴璐�
      */
-    @Excel(name = "鏀舵敮绫诲瀷",readConverterExp = "0=鍩洪噾,1=鍙拌处")
-    private Integer type;
+    @Excel(name = "鏀舵敮绫诲瀷")
+    private String type;
 
     /**
      * 鏃堕棿
@@ -64,8 +64,8 @@
     /**
      * 0:鐜伴噾,1:鑷姩鍒掓墸
      */
-    @Excel(name = "鐜伴噾/鑷姩鍒掓墸",readConverterExp = "0=鐜伴噾,1=鑷姩鍒掓墸")
-    private Integer kind;
+    @Excel(name = "鐜伴噾/鑷姩鍒掓墸")
+    private String kind;
 
     /**
      * 浣欓
@@ -105,7 +105,7 @@
     /**
      * 鍙戠敓鏃堕棿
      */
-    @Excel(name = "鍙戠敓鏃堕棿", dateFormat = "yyyy-MM-dd")
+    @Excel(name = "鏃堕棿", dateFormat = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date happenTime;
 

--
Gitblit v1.9.1