Merge branch 'hemenkou_dev' into dev

101captain

2022-03-10 dd8aa15e284c9d4c0c858e22f4130d1785261e01

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

@@ -139,4 +139,11 @@
     * @return
     */
    R timedTaskWriteDataToMerchantJobHandler();

    /**
     * check商家/店铺是否有效
     * @param userId
     * @return
     */
    Boolean checkStoreIsValid(Long userId);
}