Merge remote-tracking branch 'origin/master'

linwei

2024-01-17 f5539e2f8e35d7e53abf54409245c5c7f9d2a72a

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

@@ -177,4 +177,25 @@
   }


   /**
    *
    */
   @GetMapping("/getRegionStatisticalLabels")
   @ApiOperation(value = "统计标签", notes = "")
   public R<IPage<HouseholdLabelVO>> statisticalLabels(HouseholdLabelVO householdLabel, Query query) {
      IPage<HouseholdLabelVO> pages = householdLabelService.statisticalLabels(Condition.getPage(query), householdLabel);
      return R.data(pages);
   }

   /**
    *
    */
   @GetMapping("/getCommunityStatisticalLabels")
   @ApiOperation(value = "统计标签", notes = "")
   public R<IPage<HouseholdLabelVO>> getCommunityStatisticalLabels(HouseholdLabelVO householdLabel, Query query) {
      IPage<HouseholdLabelVO> pages = householdLabelService.getCommunityStatisticalLabels(Condition.getPage(query), householdLabel);
      return R.data(pages);
   }


}