Merge branch 'master-chw' into dev-chw

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/AppVehicleApplyController.java

@@ -11,6 +11,7 @@ import com.xxfc.platform.vehicle.pojo.dto.VehicleApplyFindDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -62,8 +63,9 @@ public class AppVehicleApplyController extends BaseController<VehicleApplyBiz> {
         BeanUtils.copyProperties(vehicleApply,vehicle);
         vehicle.setId(vehicleApply.getVehicleId());
         vehicle.setVehicleApplyId(vehicleApply.getId());
-        vehicle.setJson(JSONObject.parseObject("changeJson"));
         vehicle.setIsDel(0);
+        if (StringUtils.isNotBlank(vehicleApply.getChangeJson()))
+            vehicle.setJson(JSONObject.parseObject(vehicleApply.getChangeJson()));
         return ObjectRestResponse.succ(vehicle);
     }