Merge remote-tracking branch 'origin/master'

zhongrj

2024-02-03 b0f0ed0a1cb771c4d1a17e3c8ce90e0cf68cb641

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

@@ -99,4 +99,14 @@
   UserVO searchUserById(Long id);

   List<UserEntity> getUserInfoByDistrictId(String districtId, String building);

   /**
    * 查询没有匹配的数据
    * @return
    */
   List<User> getNotBindUserDept();

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

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