From 663fea0582f3b745f8feb93f3d6cd9515c580ff9 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期六, 24 八月 2024 16:39:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TNoticeController.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TNoticeController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TNoticeController.java
index 06ecd0f..4c66c0e 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TNoticeController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TNoticeController.java
@@ -12,6 +12,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
@@ -86,8 +87,8 @@
@GetMapping(value = "/list")
public AjaxResult<List<TNotice>> list() {
return AjaxResult.success(noticeService.list(Wrappers.lambdaQuery(TNotice.class)
- .ge(TNotice::getStartTime, LocalDateTime.now())
- .le(TNotice::getEndTime,LocalDateTime.now())));
+ .le(TNotice::getStartTime, LocalDate.now())
+ .ge(TNotice::getEndTime,LocalDate.now())));
}
--
Gitblit v1.7.1