From 0d10c5aa7d76273a89c214615dc5e0e47c211cb8 Mon Sep 17 00:00:00 2001
From: lyf66 <admin@cloudowr.com>
Date: Fri, 26 Jan 2024 09:12:10 +0800
Subject: [PATCH] merge remote-tracking branch 'origin/master'

---
 pom.xml                                                       | 4 ++--
 .../project/xyt/controller/BzServiceResourceController.java   | 4 ++--
 .../java/com/gunshi/project/xyt/so/BzServiceResourceSo.java   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index c6ab331..997596f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,8 +77,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>15</source>
-                    <target>15</target>
+                    <source>21</source>
+                    <target>21</target>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/src/main/java/com/gunshi/project/xyt/controller/BzServiceResourceController.java b/src/main/java/com/gunshi/project/xyt/controller/BzServiceResourceController.java
index 58074a9..131551b 100644
--- a/src/main/java/com/gunshi/project/xyt/controller/BzServiceResourceController.java
+++ b/src/main/java/com/gunshi/project/xyt/controller/BzServiceResourceController.java
@@ -83,8 +83,8 @@ public class BzServiceResourceController {
             query.like(BzServiceResource::getName, so.getName());
         }
 
-        query.le(BzServiceResource::getRegisterDate, so.getTimeSo().getEnd());
-        query.ge(BzServiceResource::getRegisterDate, so.getTimeSo().getStart());
+        query.le(BzServiceResource::getRegisterDate, so.getDateTimeRangeSo().getEnd());
+        query.ge(BzServiceResource::getRegisterDate, so.getDateTimeRangeSo().getStart());
         query.orderByDesc(BzServiceResource::getRegisterDate);
 
         Page<BzServiceResource> page = serviceResourceDao.page(so.getPageSo().toPage(), query);
diff --git a/src/main/java/com/gunshi/project/xyt/so/BzServiceResourceSo.java b/src/main/java/com/gunshi/project/xyt/so/BzServiceResourceSo.java
index ba2e239..410f9a9 100644
--- a/src/main/java/com/gunshi/project/xyt/so/BzServiceResourceSo.java
+++ b/src/main/java/com/gunshi/project/xyt/so/BzServiceResourceSo.java
@@ -23,7 +23,7 @@ public class BzServiceResourceSo {
     private PageSo pageSo;
 
     @NotNull(message = "时间范围不能为空", groups = {QueryTimeRange.class})
-    private DateTimeRangeSo timeSo;
+    private DateTimeRangeSo dateTimeRangeSo;
 
     @Schema(description = "服务名称")
     private String name;