解决冲突

53b57bbf · hanfeng · 50f4e1c0 · 53b57bbf
Commit 53b57bbf authored Nov 20, 2019 by hanfeng
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

BackStageOrderController.java ...om/xxfc/platform/order/rest/BackStageOrderController.java +5 -5

No files found.
--- a/xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java
+++ b/xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java
@@ -167,11 +167,11 @@ public class BackStageOrderController extends CommonBaseController implements Us
            dto.setVehicleIds(vehicleIds);
        }
        //
-		if (dto.getStartTime() != null) {
-			if (dto.getEndTime() == null) {
-				dto.setEndTime(new Date().getTime());
-			}
-		}
+//		if (dto.getStartTime() != null) {
+//			if (dto.getEndTime() == null) {
+//				dto.setEndTime(new Date().getTime());
+//			}
+//		}
 		Query query = new Query(dto);
        PageDataVO pageDataVO = PageDataVO.pageInfo(query, () -> baseOrderBiz.listOrder(query.getSuper()));