Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuish...

fengjin

2022-11-17 0430cf26ba8646c65ffb1d1a0fbdb191a8c29d74

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

@@ -146,4 +146,11 @@
     * @return
     */
    Boolean checkStoreIsValid(Long userId);

    /**
     * 根据后台用户id查询
     * @param userId
     * @return
     */
    R getMerchantByUserId(Long userId);
}