Merge remote-tracking branch 'origin/master'

linwei

2024-02-06 180905ee0e0fd86ff59d7aae19fd49d8618bd95b

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