From c8668a4a71987199e610781e7ac8cc02faa4f082 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期二, 16 十二月 2025 22:12:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhang-content/src/main/java/com/ruoyi/domain/ZfEconomy.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 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 d77272d..236a681 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZfEconomy.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfEconomy.java
@@ -8,10 +8,12 @@
import com.ruoyi.common.annotation.Excel;
import lombok.Data;
import lombok.ToString;
+import org.springframework.data.annotation.Transient;
import java.io.Serializable;
import java.time.LocalDate;
import java.util.Date;
+import java.util.List;
/**
* <p>
@@ -30,6 +32,8 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
+
+ private String fileName;
/**
* 0锛氬熀閲戙��1锛氬彴璐�
@@ -82,7 +86,7 @@
private String url;
@Excel(name = "鎵�灞炲搴紪鍙�(瀵煎叆鏁版嵁鏃惰鍒犻櫎姝ゆ爮)")
- private String familyId;
+ private Long familyId;
/**
* 鏄惁鏄湰瀹跺涵鐨勬暟鎹�(0:涓嶆槸,1:鏄�)
@@ -109,4 +113,26 @@
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private Date happenTime;
+ /**
+ * 鍒嗕韩浜篿d
+ */
+ private Integer shareId;
+
+ private String cosKey;
+
+ /**
+ * 鍙備笌鑰�
+ */
+ private String companion;
+
+ /**
+ * 鍙備笌鑰呭垪琛�
+ */
+ @TableField(exist = false)
+ private List<String> companionList;
+
+// @TableField(exist = false)
+// private Integer year;
+
+
}
--
Gitblit v1.9.1