Merge branch 'dev_wf' of wugg/phpstock into version1.5

app/admin/controller/WareHouse.php

@@ -134,7 +134,7 @@ class WareHouse extends BaseController
     public function list(){
         $post  =$this->request->post();
 
-        $condition= [['a.is_del',"=",0],['a.status',"=",1],["b.is_del","=",0]];
+        $condition= [['a.is_del',"=",0],["b.is_del","=",0]];
 
         $supplier = isset($post['supplierNo'])&&$post['supplierNo']!="" ? trim($post['supplierNo']) :"";
         if($supplier!=""){