Merge branch 'master' into dev

app-hd/controllers/ClearController.php

@@ -116,7 +116,7 @@ class ClearController extends BaseController
         }
         if (empty($salt)) {
             if (!isset($info['customShopId']) || $info['customShopId'] != $this->shopId) {
-                util::fail('不是你的结账信息');
+                //util::fail('不是你的结账信息');
             }
         } else {
             if (!isset($info['salt']) || $info['salt'] != $salt) {

app-hd/controllers/PurchaseController.php

@@ -1204,7 +1204,7 @@ class PurchaseController extends BaseController
             }
         } else {
             if (!isset($info['mainId']) || $info['mainId'] != $this->mainId) {
-                util::fail('采购单不能访问');
+                //util::fail('采购单不能访问');
             }
         }