From 263a13a155ec759b1cb26cc00edd640f4d2e747c Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 19 九月 2024 16:46:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
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..5254160 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 = LocalDate.parse(startDateStr);
+ LocalDate endDate = LocalDate.parse(endDateStr);
+
return returnData(R.SUCCESS.getCode(), customerPointService.signList(startDate, endDate));
}
--
Gitblit v1.9.3