From 5418ea7855d16dcc0169d5ed554f7a23c4b55532 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 02 十二月 2025 10:37:12 +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 |  149 +++++++++++++++++++++----------------------------
 1 files changed, 63 insertions(+), 86 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 4c3ec67..11c20ec 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZfEconomy.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfEconomy.java
@@ -1,10 +1,18 @@
 package com.ruoyi.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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;
 
 /**
  * <p>
@@ -15,138 +23,107 @@
  * @since 2023-03-12
  */
 @TableName("zf_economy")
+@Data
+@ToString
 public class ZfEconomy implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
     @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
+    private Long id;
+
+    private String fileName;
 
     /**
      * 0锛氬熀閲戙��1锛氬彴璐�
      */
-    private Integer type;
+    @Excel(name = "鏀舵敮绫诲瀷")
+    private String type;
 
     /**
      * 鏃堕棿
      */
-    private LocalDate createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date createTime;
 
     /**
      * 鏀跺叆/鏀嚭
      */
-    private Double price;
+    @Excel(name = "鏀跺叆/鏀嚭")
+    private String price;
 
     /**
      * 鐢ㄩ��
      */
-    private String use;
+    @Excel(name = "鐢ㄩ��")
+    private String useFor;
 
     /**
      * 浣跨敤浜�
      */
-    private String user;
+    @Excel(name = "浣跨敤浜�")
+    private String usePeople;
 
     /**
      * 0:鐜伴噾,1:鑷姩鍒掓墸
      */
-    private Integer kind;
+    @Excel(name = "鐜伴噾/鑷姩鍒掓墸")
+    private String kind;
 
     /**
      * 浣欓
      */
-    private Double balance;
+    @Excel(name = "浣欓")
+    private String balance;
 
     /**
      * 澶囨敞
      */
+    @Excel(name = "澶囨敞")
     private String remark;
 
+    private String url;
 
-    public Integer getId() {
-        return id;
-    }
+    @Excel(name = "鎵�灞炲搴紪鍙�(瀵煎叆鏁版嵁鏃惰鍒犻櫎姝ゆ爮)")
+    private Long familyId;
 
-    public void setId(Integer id) {
-        this.id = id;
-    }
+    /**
+     * 鏄惁鏄湰瀹跺涵鐨勬暟鎹�(0:涓嶆槸,1:鏄�)
+     */
+    @TableField(exist = false)
+    private Integer ownData = 0;
 
-    public Integer getType() {
-        return type;
-    }
+    /**
+     * 寮�濮嬫椂闂�
+     */
+    @TableField(exist = false)
+    private Date happenStartTime;
 
-    public void setType(Integer type) {
-        this.type = type;
-    }
+    /**
+     * 缁撴潫鏃堕棿
+     */
+    @TableField(exist = false)
+    private Date happenEndTime;
 
-    public LocalDate getCreateTime() {
-        return createTime;
-    }
+    /**
+     * 鍙戠敓鏃堕棿
+     */
+    @Excel(name = "鏃堕棿", dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date happenTime;
 
-    public void setCreateTime(LocalDate createTime) {
-        this.createTime = createTime;
-    }
+    /**
+     * 鍒嗕韩浜篿d
+     */
+    private Integer shareId;
 
-    public Double getPrice() {
-        return price;
-    }
+    private String cosKey;
 
-    public void setPrice(Double price) {
-        this.price = price;
-    }
+    /**
+     * 鍙備笌鑰�
+     */
+    private String companion;
 
-    public String getUse() {
-        return use;
-    }
-
-    public void setUse(String use) {
-        this.use = use;
-    }
-
-    public String getUser() {
-        return user;
-    }
-
-    public void setUser(String user) {
-        this.user = user;
-    }
-
-    public Integer getKind() {
-        return kind;
-    }
-
-    public void setKind(Integer kind) {
-        this.kind = kind;
-    }
-
-    public Double getBalance() {
-        return balance;
-    }
-
-    public void setBalance(Double balance) {
-        this.balance = balance;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Override
-    public String toString() {
-        return "ZfEconomy{" +
-        "id=" + id +
-        ", type=" + type +
-        ", createTime=" + createTime +
-        ", price=" + price +
-        ", use=" + use +
-        ", user=" + user +
-        ", kind=" + kind +
-        ", balance=" + balance +
-        ", remark=" + remark +
-        "}";
-    }
+//    @TableField(exist = false)
+//    private Integer year;
 }

--
Gitblit v1.9.1