Merge remote-tracking branch 'origin/master'

CeDo

2021-04-25 fb4639c3239dfa483aa791a9a31bd095320e48c6

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

@@ -2155,4 +2155,11 @@
     */
    @PostMapping("/common/data/population/edit")
    R editPopulation(@RequestBody EditComMngPopulationVO editComMngPopulationVO, @RequestParam("communityId") Long communityId);

    /**
     * 微心愿 删除
     * @param id 微心愿id
     */
    @PostMapping("deletemicrowish")
    R deletemicrowish(@RequestParam("id")Long id);
}