From 7070ffa6b493e75f79fe802dfc047ba3869d7b08 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期日, 25 八月 2024 21:31:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfAncestorController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfAncestorController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfAncestorController.java
index f0c0446..ea3ed43 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfAncestorController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfAncestorController.java
@@ -171,7 +171,7 @@
 
             //鏂板涓�涓粯璁ょ殑瀹跺涵鍙�
             ZfFamily zfFamily = new ZfFamily();
-            zfFamily.setName("榛樿涓�鍙峰搴�");
+            zfFamily.setName("榛樿涓�鍙峰搴�"+ancestorHelper.getClanId());
             zfFamily.setFid(0L);
             zfFamily.setMid(0L);
             zfFamily.setClanId(ancestorHelper.getClanId());

--
Gitblit v1.9.1