Merge branch 'test' into 'test_bak'

罗元桥

2021-09-28 2ab17a1a9207b64b871d307279eaba879b2e69c8

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -3154,7 +3154,7 @@
     * @return 删除结果
     */
    @PostMapping("common/data/special/delete")
    R deleteSpecialInputUser(@RequestParam(value = "id") Long id);
    R deleteSpecialInputUser(@RequestParam(value = "id") Long id,@RequestParam("communityId") Long communityId);

    /**
     * 办事指南_新增
@@ -6555,4 +6555,12 @@
     */
    @PostMapping("/cluster/member/export/admin")
    R exportClusterMember(@RequestBody PageClusterMemberAdminDto pageClusterMemberAdminDto);

    /**
     * 社区后台分页查询微心愿
     * @param comActMicroWishVO 请求参数
     * @return  微心愿列表
     */
    @PostMapping("pagemicrowishAdmin")
    R pageMicroWishAdmin(@RequestBody ComActMicroWishVO comActMicroWishVO);
}