From f0792fca6d0874de97411af39c4d58d0c120412f Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期六, 09 十一月 2024 17:15:16 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend
---
zhang-content/src/main/java/com/ruoyi/domain/ZfEconomy.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 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..4bc9ce8 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;
/**
* 浣欓
@@ -82,7 +82,7 @@
private String url;
@Excel(name = "鎵�灞炲搴紪鍙�(瀵煎叆鏁版嵁鏃惰鍒犻櫎姝ゆ爮)")
- private String familyId;
+ private Long familyId;
/**
* 鏄惁鏄湰瀹跺涵鐨勬暟鎹�(0:涓嶆槸,1:鏄�)
@@ -105,8 +105,13 @@
/**
* 鍙戠敓鏃堕棿
*/
- @Excel(name = "鍙戠敓鏃堕棿", dateFormat = "yyyy-MM-dd")
+ @Excel(name = "鏃堕棿", dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private Date happenTime;
+ /**
+ * 鍒嗕韩浜篿d
+ */
+ private Integer shareId;
+
}
--
Gitblit v1.9.1