From 92756a19ca99f2cade8a7e3ff46e08f47bf31cbc Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期二, 16 十二月 2025 22:06:34 +0800
Subject: [PATCH] 修改了一个bug
---
zhang-content/src/main/java/com/ruoyi/domain/ZfProperty.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 48 insertions(+), 4 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZfProperty.java b/zhang-content/src/main/java/com/ruoyi/domain/ZfProperty.java
index b339e4a..90f1719 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZfProperty.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfProperty.java
@@ -30,6 +30,9 @@
@TableId(type = IdType.AUTO)
private Integer id;
+ private String fileName;
+
+
/** 璧勪骇绫诲瀷 */
@Excel(name = "璧勪骇绫诲瀷")
private String type;
@@ -49,15 +52,56 @@
/** 瀛樻斁鍦板潃 */
@Excel(name = "瀛樻斁鍦板潃")
private String address;
-
+ @Excel(name = "浠峰�煎尯闂�")
+ private String valueRange;
@Excel(name="澶囨敞")
private String remark;
-// @Excel(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime createTime;
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date createTime;
+ /**
+ * 鍙戠敓鏃堕棿
+ */
+ @Excel(name = "鏃堕棿", dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ private Date happenTime;
private String url;
+ /**
+ * 瀹跺涵id
+ */
+ @Excel(name = "鎵�灞炲搴紪鍙�(瀵煎叆鏁版嵁鏃惰鍒犻櫎姝ゆ爮)")
+ private Long familyId;
+
+ /**
+ * 鏄惁鏄湰瀹跺涵鐨勬暟鎹�(0:涓嶆槸,1:鏄�)
+ */
+ @TableField(exist = false)
+ private Integer ownData = 0;
+
+ /**
+ * 鏁版嵁鐘舵��
+ */
+ @Excel(name = "鏄惁娉ㄩ攢",readConverterExp = "0=姝ｅ父,1=宸叉敞閿�")
+ private Integer status;
+
+ /**
+ * 寮�濮嬫椂闂�
+ */
+ @TableField(exist = false)
+ private Date happenStartTime;
+
+ /**
+ * 缁撴潫鏃堕棿
+ */
+ @TableField(exist = false)
+ private Date happenEndTime;
+
+ private Integer shareId;
+
}
--
Gitblit v1.9.1