Merge remote-tracking branch 'origin/master'

feige

2024-11-20 b10f260189e5db5b89d9a85ce4fb08984d2aae2a

 zhang-content/src/main/java/com/ruoyi/service/ZfFamilyService.java

@@ -24,7 +24,7 @@
    /**
     * 根据家庭名字查询家庭
     */
    ZfFamily getByName(String familyName);
    ZfFamily getByName(String familyName, Integer clanId);
    ZfFamily getByFid(Long fid);
    ZfFamily getByFamId(Long fid);
    List<UserInfoDto> getByFamilyId(Long fid);