Merge branch 'test' of 39.97.239.116:gyfl/apisongcan into test

application/index/controller/Cabinet.php

@@ -269,8 +269,6 @@ class Cabinet extends Base
         if(empty($param['cabinet_number']) && !empty($param['box_number'])){
             json_error(1007 , '柜子号码不能为空');
         }
-        $where['cabinet_number'] = $param['cabinet_number'];
-        $where['box_number'] = $param['box_number'];
         $limit = isset($param['pageSize']) ? $param['pageSize'] : 10;
         $param['pageNumber'] = isset($param['pageNumber']) ? $param['pageNumber'] : 1;
         $offset = ($param['pageNumber'] - 1) * $limit;