From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/house/controller/UserHouseLabelController.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/controller/UserHouseLabelController.java b/src/main/java/org/springblade/modules/house/controller/UserHouseLabelController.java
index 39a2c15..0970bf2 100644
--- a/src/main/java/org/springblade/modules/house/controller/UserHouseLabelController.java
+++ b/src/main/java/org/springblade/modules/house/controller/UserHouseLabelController.java
@@ -189,20 +189,26 @@
/**
- *
+ * 街道重点人员标签统计
+ * @param householdLabel
+ * @param query
+ * @return
*/
@GetMapping("/getRegionStatisticalLabels")
- @ApiOperation(value = "统计标签", notes = "")
+ @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);
}
/**
- *
+ * 社区重点人员标签统计
+ * @param householdLabel
+ * @param query
+ * @return
*/
@GetMapping("/getCommunityStatisticalLabels")
- @ApiOperation(value = "统计标签", notes = "")
+ @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);
--
Gitblit v1.9.3