Merge remote-tracking branch 'origin/master'

guoshilong

2024-02-02 d7e498f5e1f13e37df52ebd08c98e8a833b9c450

 src/main/java/org/springblade/modules/system/mapper/UserMapper.java

@@ -106,5 +106,7 @@
    */
   List<User> getNotBindUserDept();

   List<User> getUserInfoByPropertyId(String deptId);
   List<User> getUserListByDeptIds(@Param("deptIds") String receiveDept);

   List<User> getUserInfoByPropertyId(String deptId,String roleId);
}