From ae40432d02f5a698994c0b0847ef1b3f3f31451b Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <7426394+wuxixiaocui@user.noreply.gitee.com>
Date: 星期二, 08 十月 2024 17:13:27 +0800
Subject: [PATCH] Merge branch 'master-v3' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v3
---
src/main/java/com/mzl/flower/web/customer/CustomerSignInController.java | 5 ++++-
1 files changed, 4 insertions(+), 1 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 0463341..96d4cda 100644
--- a/src/main/java/com/mzl/flower/web/customer/CustomerSignInController.java
+++ b/src/main/java/com/mzl/flower/web/customer/CustomerSignInController.java
@@ -38,7 +38,10 @@
@GetMapping("/list")
@ApiOperation(value = "签到历史")
- public ResponseEntity<ReturnDataDTO<List<CustomerPointDetailDTO>>> signList(LocalDate startDate, LocalDate endDate) {
+ public ResponseEntity<ReturnDataDTO<List<CustomerPointDetailDTO>>> signList(String startDateStr, String endDateStr) {
+ LocalDate startDate = customerPointService.parseLocalDate(startDateStr);
+ LocalDate endDate = customerPointService.parseLocalDate(endDateStr);
+
return returnData(R.SUCCESS.getCode(), customerPointService.signList(startDate, endDate));
}
--
Gitblit v1.9.3