Merge branch 'dev-tiande' of http://113.105.137.151:22280/youjj/cloud-platform into dev-tiande

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/AddOrUpdateVehicleVo.java

@@ -174,4 +174,19 @@ public class AddOrUpdateVehicleVo {
 
     //可用会员类型
     private Integer memberUse;
+
+    /**
+     * 车辆状况：1、全新，2、9成新，3、8成新，4、7成新
+     */
+    private Integer vehicleStatus;
+
+    /**
+     * 车身状况：1、无剐蹭，2、微瑕疵，3、无瑕疵
+     */
+    private Integer vehicleBodyStatus;
+
+    /**
+     * 内饰：1、全新，2、9成新，3、8成新，4、7成新
+     */
+    private Integer vehicleInnerStatus;
 }
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java

@@ -1162,7 +1162,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         if (companyList != null && companyList.size() > 0) {
             params.put("companyList", companyList);
         } else {
-            params.put("companyList", Arrays.asList(-1));
+            params.put("companyList", null);
         }
         PageHelper.startPage(pageNo, pageSize);
         List<ResultVehicleVo> vehicles = mapper.getByPageNotAllData(params);