From 5d2f50012c75b366574c3b145ecdcc485fda14df Mon Sep 17 00:00:00 2001
From: xjm <xjm@cloudowr.com>
Date: Fri, 26 Jan 2024 14:06:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pom.xml b/pom.xml
index 997596f..ee7d83b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,6 +18,8 @@
         <maven.compiler.target>21</maven.compiler.target>
         <maven.test.skip>true</maven.test.skip>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+        <alibaba.easyexcel.version>3.3.2</alibaba.easyexcel.version>
     </properties>
 
     <dependencies>
@@ -33,7 +35,7 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>easyexcel</artifactId>
-            <version>3.3.2</version>
+            <version>${alibaba.easyexcel.version}</version>
         </dependency>
 
         <dependency>
diff --git a/src/main/java/com/gunshi/project/xyt/controller/WaterQualityController.java b/src/main/java/com/gunshi/project/xyt/controller/WaterQualityController.java
index 52d7c80..dbc8f15 100644
--- a/src/main/java/com/gunshi/project/xyt/controller/WaterQualityController.java
+++ b/src/main/java/com/gunshi/project/xyt/controller/WaterQualityController.java
@@ -62,7 +62,7 @@ public class WaterQualityController {
     @Operation(summary = "水质监测数据分页查询")
     @PostMapping("/page")
     public R<Page<StWaterQualityR>> page(
-            @Validated({QueryPage.class, QueryTimeRange.class}) @RequestBody(required = true)
+            @Validated({QueryPage.class, QueryTimeRange.class}) @RequestBody
             WaterQualityPageSo waterQualityPageSo
     ) {
         return R.ok(waterqualityService.page(waterQualityPageSo));
@@ -71,7 +71,7 @@ public class WaterQualityController {
     @Operation(summary = "水质监测数据导出")
     @PostMapping("/export")
     public void export(
-            @Validated({QueryPage.class, QueryTimeRange.class}) @RequestBody(required = true)
+            @Validated({QueryPage.class, QueryTimeRange.class}) @RequestBody
             WaterQualityPageSo waterQualityPageSo, HttpServletResponse response) {
         waterqualityService.export(waterQualityPageSo, response);
     }