Merge remote-tracking branch 'origin/test' into test

CeDo

2021-05-08 e37e7842a5019c64af9213fb763ea322530ac704

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

@@ -758,7 +758,7 @@
     *
     * @return
     */
    @PostMapping("timedtaskactmicrowishall")
    @PostMapping("timedtaskactmicrowish")
    R timedTaskActMicroWishAll();

    /**
@@ -1218,7 +1218,7 @@
     * @return 返回结果
     */
    @GetMapping("/convenient/business/get")
    R getComCvtBusiness(@RequestParam("id") Long id);
    R getComCvtBusiness(@RequestParam("id") Long id, @RequestParam("cityCode") String cityCode);

    /**
     * 删除便民服务商家信息