From d7819bb819cd897d5933ac98bdec7e3ccc70846c Mon Sep 17 00:00:00 2001 From: cloudroam <cloudroam> Date: 星期三, 23 十月 2024 10:55:24 +0800 Subject: [PATCH] fix: 冲突 --- src/main/java/com/mzl/flower/web/customer/CustomerSignInController.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/mzl/flower/web/customer/CustomerSignInController.java b/src/main/java/com/mzl/flower/web/customer/CustomerSignInController.java index 5254160..96d4cda 100644 --- a/src/main/java/com/mzl/flower/web/customer/CustomerSignInController.java +++ b/src/main/java/com/mzl/flower/web/customer/CustomerSignInController.java @@ -39,8 +39,8 @@ @GetMapping("/list") @ApiOperation(value = "签到历史") public ResponseEntity<ReturnDataDTO<List<CustomerPointDetailDTO>>> signList(String startDateStr, String endDateStr) { - LocalDate startDate = LocalDate.parse(startDateStr); - LocalDate endDate = LocalDate.parse(endDateStr); + LocalDate startDate = customerPointService.parseLocalDate(startDateStr); + LocalDate endDate = customerPointService.parseLocalDate(endDateStr); return returnData(R.SUCCESS.getCode(), customerPointService.signList(startDate, endDate)); } -- Gitblit v1.9.3