Merge branch 'master' into dev

app-hd/controllers/ApplyController.php

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