Merge branch 'master-new-wgg' of wugg/phpstock into master-new

app/admin/controller/Sale.php

@@ -850,9 +850,9 @@ class Sale extends Base
         if ($zx == false) {
             return error_show(1003, "未找到咨询单信息");
         }
-        if (in_array($zx['status'],[2,3])) {
-            return error_show(1003, "咨询单状态有误无法转单");
-        }
+//        if (in_array($zx['status'],[2,3])) {
+//            return error_show(1003, "咨询单状态有误无法转单");
+//        }
         $zxorder = Db::name("consult_order")->where(["zxNo" => $zx["zxNo"], "is_del" => 0])->find();
         if ($zxorder == false) {
             return error_show(1003, "未找到咨询单信息");