Merge branch 'local_20221104' into huacheng_test

yanghui

2022-12-01 1daff9a8151820980da082ece4c923f946ff8028

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java

@@ -423,6 +423,17 @@
    }

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

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