Skip to content

C
cloud-platform
Commit 53b57bbf authored by hanfeng's avatar hanfeng
Browse files
Options

解决冲突

parent 50f4e1c0
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java
View file @ 53b57bbf
...@@ -167,11 +167,11 @@ public class BackStageOrderController extends CommonBaseController implements Us ...@@ -167,11 +167,11 @@ public class BackStageOrderController extends CommonBaseController implements Us
dto.setVehicleIds(vehicleIds); dto.setVehicleIds(vehicleIds);
} }
// //
if (dto.getStartTime() != null) { // if (dto.getStartTime() != null) {
if (dto.getEndTime() == null) { // if (dto.getEndTime() == null) {
dto.setEndTime(new Date().getTime()); // dto.setEndTime(new Date().getTime());
} // }
} // }
Query query = new Query(dto); Query query = new Query(dto);
PageDataVO pageDataVO = PageDataVO.pageInfo(query, () -> baseOrderBiz.listOrder(query.getSuper())); PageDataVO pageDataVO = PageDataVO.pageInfo(query, () -> baseOrderBiz.listOrder(query.getSuper()));
......
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