From 68af47f24bc344d2e1c5e1a848458b38679ddad4 Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期一, 06 十月 2025 08:39:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhang-content/src/main/java/com/ruoyi/domain/ZProperty.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZProperty.java b/zhang-content/src/main/java/com/ruoyi/domain/ZProperty.java
index f932166..784ecf2 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZProperty.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZProperty.java
@@ -28,6 +28,7 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
+ private String fileName;
/**
* 鏈汉id
*/
@@ -69,7 +70,7 @@
/**
* 鍙樻洿鎴栨敞閿�
*/
- @Excel(name = "鍙樻洿鎴栨敞閿�")
+ @Excel(name = "鍙樻洿鎴栨敞閿�鎴栬喘涔�")
private String isChange;
/**
@@ -103,5 +104,8 @@
@JsonFormat(pattern = "yyyy-MM-dd")
private Date happenEndTime;
-
+ /**
+ * 鍒嗕韩浜�
+ */
+ private Integer shareId;
}
--
Gitblit v1.9.1