Merge branch 'version1.5' of ssh://192.168.10.210:10022/wugg/stock into version1.5

app/admin/controller/Customar.php

@@ -184,10 +184,10 @@ class Customar extends BaseController
         if (empty($idinfo)) {
             return error_show(1004, "未找到数据");
         }
-        $companyNo = isset($this->post['companyNo']) && $this->post['companyNo'] !== "" ? $this->post['companyNo'] : "";
-        if ($companyNo == "") {
-            return error_show(1002, "参数companyNo不能为空");
-        }
+//        $companyNo = isset($this->post['companyNo']) && $this->post['companyNo'] !== "" ? $this->post['companyNo'] : "";
+//        if ($companyNo == "") {
+//            return error_show(1002, "参数companyNo不能为空");
+//        }
 //        $company = Db::name('customer_info')->where(['companyNo'=>$companyNo,'is_del'=>0])->find();
 //        if(empty($company)){
 //            return error_show(1004,"未找到数据");
@@ -215,7 +215,7 @@ class Customar extends BaseController
             $data = [
                 "id" => $id,
                 "companyName" => $companyName,
-                "companyNo" => $companyNo,
+                //"companyNo" => $companyNo,
                 "parent" => $parent,
                 "updatetime" => date("Y-m-d H:i:s"),
             ];