From 351b9a53cb9ecebdf8f79db0117f540d9c42c2a4 Mon Sep 17 00:00:00 2001
From: whycrzg <ruanzhigang@whycst.com>
Date: 星期二, 23 二月 2021 17:19:23 +0800
Subject: [PATCH] update

---
 src/main/java/com/fgkj/controller/Batt_devalarm_data_historyController.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/fgkj/controller/Batt_devalarm_data_historyController.java b/src/main/java/com/fgkj/controller/Batt_devalarm_data_historyController.java
index 7a77196..b217d2e 100644
--- a/src/main/java/com/fgkj/controller/Batt_devalarm_data_historyController.java
+++ b/src/main/java/com/fgkj/controller/Batt_devalarm_data_historyController.java
@@ -22,8 +22,8 @@
 	private Batt_devalarm_data_historyService service;
 
 	//3.4璁惧鍛婅鍘嗗彶璁板綍鏌ヨ
-	@GetMapping("byCondition")
-	@ApiOperation(notes = "",value="璁惧鍛婅鍘嗗彶璁板綍鏌ヨ")
+	@PostMapping("byCondition")
+	@ApiOperation(notes = "{ \"pageBean\": { \"pageNum\": 1, \"pageSize\": 3 },\"binf\": { \"stationName\": \"\", \"stationName1\": \"\" },\"adata_H\": { \"alm_start_time\": \"2000-12-15 09:09:57\", \"alm_start_time1\": \"2020-12-15 09:09:57\" } }",value="璁惧鍛婅鍘嗗彶璁板綍鏌ヨ")
 	public ServiceModel serchByCondition(@RequestBody Batt_Maint_Dealarm bmd) {
 		// Batt_Maint_Dealarm bmd = getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Batt_Maint_Dealarm.class);
 		User_inf uinf=(User_inf) ActionUtil.getUser();
@@ -35,7 +35,7 @@
 
 	//3.4璁惧鍘嗗彶鍛婅(鍒犻櫎鍛婅)<澶氭暟鎹垹闄�>
 	@DeleteMapping("/")
-	@ApiOperation(notes = "",value="璁惧鍘嗗彶鍛婅(鍒犻櫎鍛婅)<澶氭暟鎹垹闄�>")
+	@ApiOperation(notes = "[{ \"num\":1, \"stationName\":\"\", \"note\":\"\" }]",value="璁惧鍘嗗彶鍛婅(鍒犻櫎鍛婅)<澶氭暟鎹垹闄�>")
 	public ServiceModel deletePro(@RequestBody List<Batt_devalarm_data_history> list) {
 		// List<Batt_devalarm_data_history> list = getGson().fromJson(json,new TypeToken<List<Batt_devalarm_data_history>>(){}.getType());
 		ServiceModel model = service.deletePro(list);

--
Gitblit v1.9.1