Merge remote-tracking branch 'origin/master'

zhongrj

2024-01-27 41be4062287acd5bee79875fd28c4c0af18d599c

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

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

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