From f1ef1f2baf4e58733c4913ce5df0b3d2ea582308 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期三, 12 十一月 2025 16:49:08 +0800
Subject: [PATCH] 修改了一个bug

---
 zhang-content/src/main/java/com/ruoyi/domain/ZfEquipment.java |  117 ++++++++++++++++++++++++++++------------------------------
 1 files changed, 56 insertions(+), 61 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZfEquipment.java b/zhang-content/src/main/java/com/ruoyi/domain/ZfEquipment.java
index 36e0563..29ec656 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZfEquipment.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfEquipment.java
@@ -1,10 +1,16 @@
 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 java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * <p>
@@ -15,110 +21,99 @@
  * @since 2023-03-12
  */
 @TableName("zf_equipment")
+@Data
 public class ZfEquipment implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
     @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
+    private Long id;
 
     /**
      * 璁惧鍚嶇О
      */
+    @Excel(name = "璁惧鍚嶇О")
     private String name;
 
     /**
-     * 璁板綍鏃堕棿
+     * 淇濅慨鏈熼檺
      */
-    private LocalDateTime createDate;
+    @Excel(name = "淇濅慨鏈熼檺")
+    private String baoXiu;
+
+    /**
+     * 鎻掑叆鏃堕棿
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date createTime;
 
     /**
      * 璐拱浜�
      */
+    @Excel(name = "璐拱浜�")
     private String buyer;
 
     /**
      * 浜嬮」鍐呭
      */
+    @Excel(name = "浜嬮」鍐呭")
     private String content;
 
     /**
      * 瀛樻斁鍦扮偣
      */
+    @Excel(name = "瀛樻斁鍦扮偣")
     private String location;
 
     /**
      * 澶囨敞
      */
+    @Excel(name = "澶囨敞")
     private String remark;
 
+    /**
+     * 瀹跺涵id
+     */
+    @Excel(name = "鎵�灞炲搴紪鍙�(瀵煎叆鏁版嵁鏃惰鍒犻櫎姝ゆ爮)")
+    private Long familyId;
 
-    public Integer getId() {
-        return id;
-    }
+    private String url;
 
-    public void setId(Integer id) {
-        this.id = id;
-    }
+    private String fileName;
 
-    public String getName() {
-        return name;
-    }
+    @Excel(name = "鏄惁娉ㄩ攢",readConverterExp = "0=姝ｅ父,1=宸叉敞閿�")
+    private Integer status;
 
-    public void setName(String name) {
-        this.name = name;
-    }
 
-    public LocalDateTime getCreateDate() {
-        return createDate;
-    }
+    /**
+     * 鏄惁鏄湰瀹跺涵鐨勬暟鎹�(0:涓嶆槸,1:鏄�)
+     */
+    @TableField(exist = false)
+    private Integer ownData = 0;
 
-    public void setCreateDate(LocalDateTime createDate) {
-        this.createDate = createDate;
-    }
+    /**
+     * 寮�濮嬫椂闂�
+     */
+    @TableField(exist = false)
+    private Date happenStartTime;
 
-    public String getBuyer() {
-        return buyer;
-    }
+    /**
+     * 缁撴潫鏃堕棿
+     */
+    @TableField(exist = false)
+    private Date happenEndTime;
 
-    public void setBuyer(String buyer) {
-        this.buyer = buyer;
-    }
+    /**
+     * 璁板綍鏃堕棿
+     */
+    @Excel(name = "鏃堕棿", dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date happenTime;
 
-    public String getContent() {
-        return content;
-    }
+    /**
+     * 鍒嗕韩浜篿d
+     */
+    private Integer shareId;
 
-    public void setContent(String content) {
-        this.content = content;
-    }
 
-    public String getLocation() {
-        return location;
-    }
-
-    public void setLocation(String location) {
-        this.location = location;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Override
-    public String toString() {
-        return "ZfEquipment{" +
-        "id=" + id +
-        ", name=" + name +
-        ", createDate=" + createDate +
-        ", buyer=" + buyer +
-        ", content=" + content +
-        ", location=" + location +
-        ", remark=" + remark +
-        "}";
-    }
 }

--
Gitblit v1.9.1