Skip to content

C
cloud-platform
Commit 5d214b8a authored by unset's avatar unset
Browse files
Options

Merge branch 'master-vehicle-price' into dev-tiande

parents 3d4b3e9e 647f46f7
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java
View file @ 5d214b8a
......@@ -226,7 +226,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
Vehicle vehicle = new Vehicle();
if (StringUtils.isNotBlank(addOrUpdateVehicleVo.getRegisterDate())) {
addOrUpdateVehicleVo.setVehicleRegisterDate(DateTime.parse(addOrUpdateVehicleVo.getRegisterDate(), DateTimeFormat.forPattern("yyyy-MM-dd")).toDate());
addOrUpdateVehicleVo.setVehicleRegisterDate(DateTime.parse(addOrUpdateVehicleVo.getRegisterDate(), DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss")).toDate());
}
BeanUtilsBean.getInstance().copyProperties(vehicle, addOrUpdateVehicleVo);
......@@ -297,7 +297,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
for (AddOrUpdateVehicleVo addOrUpdateVehicleVo : addOrUpdateVehicleVoList) {
Vehicle vehicle = new Vehicle();
if (StringUtils.isNotBlank(addOrUpdateVehicleVo.getRegisterDate())) {
addOrUpdateVehicleVo.setVehicleRegisterDate(DateTime.parse(addOrUpdateVehicleVo.getRegisterDate(), DateTimeFormat.forPattern("yyyy-MM-dd")).toDate());
addOrUpdateVehicleVo.setVehicleRegisterDate(DateTime.parse(addOrUpdateVehicleVo.getRegisterDate(), DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss")).toDate());
}
BeanUtilsBean.getInstance().copyProperties(vehicle, addOrUpdateVehicleVo);
if (addOrUpdateVehicleVo.getParkBranchCompanyId() == null) {
......
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