From a9e3948c9b9af14a373dacb1cb7babdbe9fd0b07 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 16 七月 2021 14:20:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index 279d16f..8f8d0ce 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -1454,6 +1454,15 @@
     R pageQueryComMngRealCompany(@RequestBody PageComMngRealCompanyDTO pageComMngRealCompanyDTO);
 
     /**
+     * 社区后台实有单位统计
+     *
+     * @param communityId 社区id
+     * @return 统计结果
+     */
+    @PostMapping("/common/data/company/statistics")
+    R getComMngRealCompanyTotalByAdmin(@RequestParam("communityId") Long communityId);
+
+    /**
      * 社区后台添加修改实有单位
      *
      * @param comMngRealCompanyVO
@@ -3626,4 +3635,13 @@
      */
     @GetMapping("/eventgrid/community/list")
     R getCommunityLists();
+
+    /**
+     * 分页查询退役军人列表
+     *
+     * @param comExServicemanDTO 请求参数
+     * @return 退役军人列表
+     */
+    @PostMapping("/population/page/exServiceman")
+    R pageExServiceman(@RequestBody ComExServicemanDTO comExServicemanDTO);
 }

--
Gitblit v1.7.1