Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-26 8da7ca5f5a5466c76b0d0abe23c7935e13e09136

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

@@ -6580,6 +6580,14 @@
    R<ConvenientMerchantVO> getUserMerchantInfoByAccount(@RequestParam("account") String account);

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

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