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/ZProperty.java | 7 +++++-- 1 files changed, 5 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..812b71f 100644 --- a/zhang-content/src/main/java/com/ruoyi/domain/ZProperty.java +++ b/zhang-content/src/main/java/com/ruoyi/domain/ZProperty.java @@ -69,7 +69,7 @@ /** * 鍙樻洿鎴栨敞閿� */ - @Excel(name = "鍙樻洿鎴栨敞閿�") + @Excel(name = "鍙樻洿鎴栨敞閿�鎴栬喘涔�") private String isChange; /** @@ -103,5 +103,8 @@ @JsonFormat(pattern = "yyyy-MM-dd") private Date happenEndTime; - + /** + * 鍒嗕韩浜� + */ + private Integer shareId; } -- Gitblit v1.9.1