Merge remote-tracking branch 'origin/master'

feige

2024-06-10 2f432628a460a73f830c278a7d69e8328767a7b6

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

@@ -30,7 +30,7 @@
   // AjaxResult updateBySysId()
    List<ZInfoUser> selectByCondition(ZInfoUser zInfoUser);

    AjaxResult removeByUserName(List userName);
    AjaxResult removeByUserName(List<String> userName);
    List<ZInfoUser> selectByFamId(long fid);
    AjaxResult searchMyRelation();