Merge remote-tracking branch 'origin/master'

puzhibing

2024-08-24 d0e96daddf8d06900c468ee71a8ee4f14fc1c980

Merge remote-tracking branch 'origin/master'

 .gitignore

@@ -16,4 +16,5 @@
target

*.yaml
*.yml
*.yml
*.log

 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())));
                .ge(TNotice::getStartTime, LocalDate.now())
                .le(TNotice::getEndTime,LocalDate.now())));

    }