From 5d7b0a0bbcae6844e2296ef53c3f4c88293dacfe Mon Sep 17 00:00:00 2001
From: jinquanOu <1511349576@qq.com>
Date: 星期二, 11 六月 2024 18:18:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhang-content/src/main/java/com/ruoyi/domain/ZfFamily.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZfFamily.java b/zhang-content/src/main/java/com/ruoyi/domain/ZfFamily.java
index 7c4175d..0f0cdc2 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZfFamily.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfFamily.java
@@ -27,5 +27,18 @@
/**
* 瀹跺涵鍚嶇О
*/
+ @Excel(name="瀹跺涵鍙�")
+
private String name;
+
+
+ /**
+ * 瀹跺涵鍚嶇О
+ */
+ @Excel(name="鐖朵翰id")
+
+ private Long fid;
+
+
+
}
--
Gitblit v1.9.1