Merge remote-tracking branch 'origin/master'

xuhy

5 天以前 4e0b0be90a8bf14a59f4cfee7959534adea24ba3

 ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

@@ -299,4 +299,5 @@
     */
    Integer selectUserCount(List<String> projectId, Integer deptType);

    List<SysUser> selectUserByNickName(String nickName);
}