Merge remote-tracking branch 'origin/master-modify-cutAmount' into master-modify-cutAmount

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

@@ -27,7 +27,7 @@ public class VehicleModelQueryCondition {
     @ApiModelProperty(value = "是否删除")
     private Integer isDel;
     @ApiModelProperty(value = "状态")
-    private Integer status=1;
+    private Integer status;
     @ApiModelProperty("分类逗号分割")
     String catasStr;
     @ApiModelProperty("排除的车型id")

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

@@ -49,8 +49,8 @@ public class VehicleModelBiz extends BaseBiz<VehicleModelMapper, VehicleModel> {
      * @return
      */
     public ObjectRestResponse findVehicleModelPage(VehicleModelQueryCondition vmqc) {
-        if (vmqc.getPathType()==1) {
-            vmqc.setStatus(null);
+        if (vmqc.getPathType()==2) {
+            vmqc.setStatus(1);
         }
         try {
             PageDataVO<VehicleModelVo> mPageDataVO = PageDataVO.pageInfo(vmqc.getPage(),