From 7b8758054b52e369710e8625d893eec8293ab166 Mon Sep 17 00:00:00 2001
From: he wei <858544502@qq.com>
Date: 星期四, 01 十二月 2022 10:40:58 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/ResMeterManager
---
src/main/java/com/whyc/controller/FileParamController.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/whyc/controller/FileParamController.java b/src/main/java/com/whyc/controller/FileParamController.java
index c15f89f..e87f339 100644
--- a/src/main/java/com/whyc/controller/FileParamController.java
+++ b/src/main/java/com/whyc/controller/FileParamController.java
@@ -30,7 +30,8 @@
, @RequestParam(required = false,defaultValue = "2222-01-01 00:00:00") String endTime
, @RequestParam(required = false) String battVol
,@RequestParam(required = false ,defaultValue = "1") int pageCurr
- ,@RequestParam(required = false ,defaultValue = "10") int pageSize) {
+ ,@RequestParam(required = false ,defaultValue = "10") int pageSize
+ ,@RequestParam(required = false ,defaultValue = "0") int flag) {
Date testTime1= null;
Date testTime2= null;
try {
@@ -39,7 +40,7 @@
} catch (ParseException e) {
e.printStackTrace();
}
- return service.getDataByCondition(testTime1,testTime2,battVol,pageCurr,pageSize);
+ return service.getDataByCondition(testTime1,testTime2,battVol,pageCurr,pageSize,flag);
}
@ApiOperation("鍒犻櫎鍩虹珯涓嬫暟鎹�")
@GetMapping("deleteDataById")
--
Gitblit v1.9.1