From c24698dacd5d43d99bbae35b430a189675a6532b Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 06 五月 2025 17:08:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhang-content/src/main/java/com/ruoyi/domain/ZfClean.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZfClean.java b/zhang-content/src/main/java/com/ruoyi/domain/ZfClean.java
index ed520e9..badf92c 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZfClean.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfClean.java
@@ -31,7 +31,7 @@
/**
* 0锛氫繚娲侊紝1锛氭敹绾�
*/
- @Excel(name = "绫诲瀷",readConverterExp = "0=淇濇磥,1=鏀剁撼")
+ @Excel(name = "绫诲瀷(蹇呴』鏄繚娲佹垨鑰呮敹绾�)",readConverterExp = "0=淇濇磥,1=鏀剁撼")
private Integer kind;
/**
@@ -110,4 +110,9 @@
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private Date happenTime;
+ /**
+ * 鍒嗕韩浜篿d
+ */
+ private Integer shareId;
+
}
--
Gitblit v1.9.1