From 6905023c1ce3239f5b2569caac6d151e9788841c Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 29 六月 2022 10:25:03 +0800
Subject: [PATCH] Merge branch 'huacheng_dev' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_dev
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
index 678af6c..0bf93cb 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
@@ -11,6 +11,7 @@
import com.panzhihua.common.model.vos.common.ComMngVolunteerServiceTypeVo;
import com.panzhihua.common.model.vos.common.ComMngVolunteerSkillVo;
import com.panzhihua.common.model.vos.community.*;
+import com.panzhihua.common.model.vos.neighbor.ActivityAnalysisVO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAnalysisVO;
import io.swagger.annotations.*;
import org.springframework.util.ObjectUtils;
@@ -363,7 +364,7 @@
return communityService.addActivity(comActActivityVO);
}
- @ApiOperation(value = "单位活动统计",response = ComActNeighborCircleAnalysisVO.class)
+ @ApiOperation(value = "单位活动统计",response = ActivityAnalysisVO.class)
@GetMapping("activity/unit/analysis")
public R activityUnitAnalysis(@RequestParam(value = "year") Integer year,@RequestParam("communityId") Long communityId ){
return communityService.institutionalUnitServiceAnalysis(year,communityId);
--
Gitblit v1.7.1