merge remote-tracking branch 'origin/master'

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>

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);

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;