Merge remote-tracking branch 'origin/master'

zhongrj

2024-01-27 41be4062287acd5bee79875fd28c4c0af18d599c

 src/main/java/org/springblade/modules/system/service/IUserService.java

@@ -253,5 +253,7 @@
    */
   Object handleUserDept();

   List<User> getUserInfoByPropertyId(String propertyCompanyId);
   List<User> getUserInfoByPropertyId(String propertyCompanyId,String roleId);

   Object handleUser();
}