Merge branch 'master' into dev

app-hd/controllers/ApplyController.php

@@ -131,7 +131,7 @@ class ApplyController extends BaseController
             //前期限制只有批发店邀请了才能注册
             $ghsShopAdminId = $post['ghsShopAdminId'] ?? 0;
             if (empty($ghsShopAdminId)) {
-                //util::fail('批发店推荐才能注册');
+                util::fail('批发店推荐才能注册');
             }
 
             $shopName = $post['name'] ?? '';