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

huanghongfa

2021-05-08 554e8aaef09ad38484ea043ab56405bbfea36c80

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComCvtBusinessService.java

@@ -37,10 +37,9 @@
    /**
     * 查询便民服务商家详情
     * @param id 商家主键
     * @param cityCode 城市编码
     * @return
     */
    R getComCvtBusiness(Long id, String cityCode);
    R getComCvtBusiness(Long id);

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