From 687d0fc2de844e09864cc2ea2b24550069a50546 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期四, 26 十月 2023 16:00:38 +0800 Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike into dev --- server/platform/src/main/java/com/doumee/api/business/GoodsorderController.java | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/server/platform/src/main/java/com/doumee/api/business/GoodsorderController.java b/server/platform/src/main/java/com/doumee/api/business/GoodsorderController.java index facb6c4..bd350df 100644 --- a/server/platform/src/main/java/com/doumee/api/business/GoodsorderController.java +++ b/server/platform/src/main/java/com/doumee/api/business/GoodsorderController.java @@ -89,6 +89,8 @@ @PostMapping("/getTotalData") @RequiresPermissions("business:goodsorder:query") public ApiResponse<GoodsorderTotalDataVO> getTotalData (@RequestBody Goodsorder pageWrap) { + + pageWrap.setEndDate(pageWrap.getEndDate() != null ? pageWrap.getEndDate():pageWrap.getStartDate()); return ApiResponse.success(goodsorderService.getTotalData(pageWrap)); } -- Gitblit v1.9.3