From 0c68ddbef7aa46a1e62cca537acf12d2b8178f31 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期五, 08 九月 2023 13:34:08 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/fg_v2.0

---
 src/main/java/com/whyc/controller/BattalarmDataHistoryController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/whyc/controller/BattalarmDataHistoryController.java b/src/main/java/com/whyc/controller/BattalarmDataHistoryController.java
index 93f42bd..e0f09b7 100644
--- a/src/main/java/com/whyc/controller/BattalarmDataHistoryController.java
+++ b/src/main/java/com/whyc/controller/BattalarmDataHistoryController.java
@@ -26,7 +26,7 @@
 
     @PostMapping("/serchByInfo")
     @ApiOperation(value = "鐢垫睜鍛婅鍘嗗彶璁板綍鏌ヨ")
-    public Response serchByInfo(@RequestBody AlarmPar param) throws ParseException {
+    public Response serchByInfo(@RequestBody AlarmPar param) throws ParseException, InterruptedException {
         //return service.serchByInfo(par);
         return service.getPageInfo(param);
     }

--
Gitblit v1.9.1