From 8da7ca5f5a5466c76b0d0abe23c7935e13e09136 Mon Sep 17 00:00:00 2001 From: yanghui <2536613402@qq.com> Date: 星期六, 26 十一月 2022 12:50:34 +0800 Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java index bde477a..65a62bd 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java +++ b/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 -- Gitblit v1.7.1