Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

puhanshu

2022-08-16 a6dadc1633f8c0b19c8b033f4c560b70211fb67d

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