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

huanghongfa

2021-05-08 554e8aaef09ad38484ea043ab56405bbfea36c80

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

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

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