Skip to content

C
cloud-platform
Commit 8e0832ee authored by hezhen's avatar hezhen
Browse files
Options

Merge branch 'dev-tiande' of http://113.105.137.151:22280/youjj/cloud-platform into dev-tiande

parents 122c2a28 b1c91f8e
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/background/BgShuntApplyController.java
View file @ 8e0832ee
...@@ -228,8 +228,8 @@ public class BgShuntApplyController extends BaseController<ShuntApplyBiz, ShuntA ...@@ -228,8 +228,8 @@ public class BgShuntApplyController extends BaseController<ShuntApplyBiz, ShuntA
rbd.setEndCompanyId(companyId); rbd.setEndCompanyId(companyId);
rbd.setBookStartDate(DateUtil.date(shuntApply.getStartTime()).toDateStr()); rbd.setBookStartDate(DateUtil.date(shuntApply.getStartTime()).toDateStr());
rbd.setBookEndDate(DateUtil.date(shuntApply.getEndTime()).toDateStr()); rbd.setBookEndDate(DateUtil.date(shuntApply.getEndTime()).toDateStr());
rbd.setBookStartDateTime(DateUtil.date(shuntApply.getStartTime()).toTimeStr()); rbd.setBookStartDateTime(DateUtil.date(shuntApply.getStartTime()).toString());
rbd.setBookEndDateTime(DateUtil.date(shuntApply.getEndTime()).toTimeStr()); rbd.setBookEndDateTime(DateUtil.date(shuntApply.getEndTime()).toString());
//查询本公司时间段内可用车辆 //查询本公司时间段内可用车辆
ObjectRestResponse<PageDataVO<UsableVeicleVO>> usableVehiclePage = vehicleFeign.applyUsableVehicle(rbd); ObjectRestResponse<PageDataVO<UsableVeicleVO>> usableVehiclePage = vehicleFeign.applyUsableVehicle(rbd);
......
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