Merge branch 'master' of http://git.huaml.com/zhh/huahuibao

biz-ghs/shop/services/ShopAdminService.php

@@ -42,7 +42,7 @@ class ShopAdminService extends BaseService
         $name = $data['name'] ?? '未命名';
 
         if (isset($admin['subscribe']) == false || $admin['subscribe'] != 1) {
-            util::fail("请关注公众号");
+            //util::fail("请关注公众号");
         }
         $avatar = $admin['avatar'] ?? '';
 

biz-hd/admin/services/ShopAdminService.php

@@ -51,7 +51,7 @@ class ShopAdminService extends BaseService
             util::fail('小程序码已失效，请重新创建员工');
         }
         if (isset($admin['subscribe']) == false || $admin['subscribe'] != 1) {
-            util::fail("请关注公众号");
+            //util::fail("请关注公众号");
         }
         $avatar = $admin['avatar'] ?? '';