Merge branch 'dev_wf' of wugg/cxinv into dev

app/admin/controller/User.php

@@ -96,7 +96,7 @@ class User extends BaseController{
 	 * 用户列表
 	 */
     public function  userList(){
-    	$post=$this->request->only(["token"=>"","nickname"=>"","relaComNo"=>"","islevel"=>"","username"=>"","companyNo"=>"","status"=>"","page"=>1,"size"=>10],"post");
+    	$post=$this->request->only(["token"=>"","nickname"=>"","relaComNo"=>"","islevel"=>"","username"=>"","companyNo"=>"","status"=>"","page"=>1,"size"=>10,'level'=>''],"post");
        if($this->level==1){
        	$companyNo = $post['companyNo']??"";
        }else{