Merge remote-tracking branch 'origin/master'

feige

2025-05-06 c24698dacd5d43d99bbae35b430a189675a6532b

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

@@ -24,9 +24,12 @@
    /**
     * 根据家庭名字查询家庭
     */
    ZfFamily getByName(String familyName);
    ZfFamily getByName(String familyName, Integer clanId);
    ZfFamily getByFid(Long fid);
    ZfFamily getByFamId(Long fid);

    List<ZfFamily> getByClanId(Long clanId);

    List<UserInfoDto> getByFamilyId(Long fid);

    List<UserInfoDto> getNowMember();