Commit 62b6414c authored by hezhen's avatar hezhen

123

parent c1669e33
package com.xxfc.platform.vehicle.entity;
import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -345,6 +346,6 @@ public class Vehicle {
@Transient
@ApiModelProperty("改变的json")
private String changeJson;
private JSONObject json;
}
\ No newline at end of file
package com.xxfc.platform.vehicle.rest;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.util.BeanUtils;
import com.xxfc.platform.vehicle.biz.VehicleApplyBiz;
......@@ -60,6 +62,7 @@ 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);
return ObjectRestResponse.succ(vehicle);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment