Merge remote-tracking branch 'origin/dev-chw' into dev-chw

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

@@ -83,6 +83,7 @@ public class VehicleApplyBiz extends BaseBiz<VehicleApplyMapper, VehicleApply>{
         VehicleApply vehicleApply=new VehicleApply();
         vehicleApply.setVehicleId(vehicleId);
         vehicleApply.setApplyStatus(0);
+        vehicleApply.setIsDel(0);
         return  selectCount(vehicleApply);
     }
 

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

@@ -1621,6 +1621,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         if (StringUtils.isNotBlank(vehicleId)){
             vehicle.setExtensionList(null);
             if (!CheckObjectIsNullUtils.objCheckIsNull(vehicle) ){
+                vehicle.setIsDel(0);
                 vehicle.setId(vehicleId);
                 updateSelectiveById(vehicle);
             }