Merge remote-tracking branch 'origin/master'

fei

4 天以前 68af47f24bc344d2e1c5e1a848458b38679ddad4

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

@@ -27,6 +27,9 @@
    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();