Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-17 6e907cce72e42a349123800d697aa99f3360783e

 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);
}