Merge remote-tracking branch 'origin/master'

linwei

2024-01-03 c4fb77c78f0617abdf117ca135dfee519f0bca51

 src/main/java/org/springblade/modules/house/controller/HouseController.java

@@ -201,8 +201,12 @@


   @GetMapping("getHouseStatistics")
   public R getHouseStatistics(@RequestParam("code") String code, @RequestParam("roleType") String roleType) {
      Map<String, Object> result = houseService.getHouseStatistics(code, roleType);
   public R getHouseStatistics(@RequestParam("code") String code,
                        @RequestParam("roleType") String roleType,
                        @RequestParam(value = "aoiCode", required = false) String aoiCode,
                        @RequestParam(value = "buildingCode", required = false) String buildingCode,
                        @RequestParam(value = "unitCode", required = false) String unitCode) {
      Map<String, Object> result = houseService.getHouseStatistics(code, roleType,aoiCode,buildingCode,unitCode);
      return R.data(result);
   }