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

tangxiaobao

2021-08-19 4cb51a8d6a46993cb30e22dcbaf85424a0ba9d43

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

@@ -36,6 +36,7 @@

    /**
     * 查询便民服务商家详情
     * @param id 商家主键
     * @return
     */
    R getComCvtBusiness(Long id);