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/DevalarmDataHistoryController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/whyc/controller/DevalarmDataHistoryController.java b/src/main/java/com/whyc/controller/DevalarmDataHistoryController.java
index e7dbba5..1ad95be 100644
--- a/src/main/java/com/whyc/controller/DevalarmDataHistoryController.java
+++ b/src/main/java/com/whyc/controller/DevalarmDataHistoryController.java
@@ -22,7 +22,7 @@
//璁惧鍛婅鍘嗗彶鏌ヨ
@ApiOperation(value = "璁惧鍛婅鍘嗗彶鏌ヨ")
@PostMapping("serchByCondition")
- public Response serchByCondition(@RequestBody DevAlarmPar param) throws ParseException {
+ public Response serchByCondition(@RequestBody DevAlarmPar param) throws ParseException, InterruptedException {
//return service.serchByCondition(par);
return service.getPageInfo(param);
}
--
Gitblit v1.9.1