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

app/admin/controller/Consult.php

@@ -69,9 +69,9 @@ class Consult extends Base
         $page = isset($this->post['page']) && $this->post['page'] !== "" ? intval($this->post['page']) :"1";
         $size = isset($this->post['size']) && $this->post['size'] !== "" ? intval($this->post['size']) :"10";
         $where=[['a.is_del',"=",0],['b.is_del',"=",0]];
-        $zxNo = isset($this->post['zxNo']) && $this->post['zxNo'] !== "" ? trim($this->post['zxNo']) : "";
-        if ($zxNo !== "") {
-            $where[] = ['a.zxNo','=',$zxNo];
+        $infoNo = isset($this->post['zxNo']) && $this->post['zxNo'] !== "" ? trim($this->post['zxNo']) : "";
+        if ($infoNo !== "") {
+            $where[] = ['a.infoNo','=',$infoNo];
         }
 //        $sequenceNo = isset($this->post['sequenceNo']) && $this->post['sequenceNo'] !== "" ? trim($this->post['sequenceNo']) : "";
 //        if ($sequenceNo !== "") {