Merge remote-tracking branch 'origin/master'

feige

2024-08-25 7070ffa6b493e75f79fe802dfc047ba3869d7b08

Merge remote-tracking branch 'origin/master'

 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());