Merge remote-tracking branch 'origin/master'

zhongrj

2024-03-11 7f3ee212eb210aba3a7da7d2cb4a8d1af2f56116

 src/main/java/org/springblade/modules/system/controller/UserController.java

@@ -407,6 +407,15 @@
      return R.data(userService.getUserInfoByDistrictId(districtId, building));
   }

   /**
    * 通过小区id查询物业人员/网格人员
    */
   @GetMapping("/getUserInfoByDistrictIds")
   @ApiOperation(value = "查询物业人员By小区id", notes = "houseCode")
   public R getUserInfoByDistrictIds(@RequestParam("districtIds") String districtIds) {
      return R.data(userService.getUserInfoByDistrictIds(districtIds));
   }


   /**
    * 通过机构查询物业公司人员