Merge remote-tracking branch 'origin/master'

feige

2025-06-23 8d0db2a5b91a38960855ab3f5ee3e92fe363e8e2

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

@@ -25,6 +25,7 @@

    Boolean findByuid(Long uid, Long tfid);

    List<ZInfoUser>  findByUaidToFaid(String usid);
    List<ZInfoUser> selectByClanId(Integer clanId);

    AjaxResult findUserNameAClan(List<String> nickNames);