Merge branch 'local_20221104' into huacheng_test

yanghui

2022-12-01 0ab77d6e1b6102b1fd14a134a9acb6d173f40d2b

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

@@ -79,6 +79,13 @@
    R<ConvenientMerchantVO> getUserMerchantInfoByAccount(String account);

    /**
     * 获取用户便民服务商家详情
     * @param account 商家绑定账号
     * @return
     */
    R<ConvenientMerchantVO> getMerchantInfoByAccount(String account);

    /**
     * 获取商便民服务商家信息
     * @param userId
     * @return