From f3c27fb78447449a950ba73c5e72ceda64ad8a12 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期四, 25 五月 2023 11:21:39 +0800
Subject: [PATCH] 导出中英文切换日志
---
src/main/java/com/whyc/controller/BattalarmDataController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/whyc/controller/BattalarmDataController.java b/src/main/java/com/whyc/controller/BattalarmDataController.java
index ff7b915..8b370a9 100644
--- a/src/main/java/com/whyc/controller/BattalarmDataController.java
+++ b/src/main/java/com/whyc/controller/BattalarmDataController.java
@@ -25,9 +25,9 @@
@Autowired
private BattalarmDataService service;
- /*@GetMapping("/getAll")
- @ApiOperation(value = "鏌ヨ鎵�鏈夌殑瀹炴椂鍛婅")*/
- public Response<List<BattalarmData>> getAll(){
+ @GetMapping("/getAll")
+ @ApiOperation(value = "鏌ヨ鎵�鏈夌殑瀹炴椂鍛婅")
+ public Response getAll(){
return service.getAll();
}
@@ -111,7 +111,7 @@
@ApiOperation(value = "鑾峰彇搴曢儴鐢垫睜鍛婅",notes = "椤圭洰涓嬫柟鐨勬粴鍔紝鏌ヨ鏈�鏂扮數姹犲憡璀�(鐢垫睜鍛婅鍜岃澶囧憡璀︾瓫閫夊嚭鏈�鏂扮殑浜旀潯)")
public Response getRealAlarm(){
UserInf userInf = ActionUtil.getUser();
- return service.getRealAlarm(userInf.getUId().intValue());
+ return service.getRealAlarm(userInf.getUId().intValue(), null);
}
--
Gitblit v1.9.1