Merge remote-tracking branch 'origin/master'

无关风月

8 小时以前 3548f8f669884e1caf9f037a726394464eb85d44

 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);
}