From 69cabccf54597a8ae1ca3981f179075bfc763278 Mon Sep 17 00:00:00 2001
From: liusuyi <13324259@qq.com>
Date: 星期日, 16 七月 2023 17:04:59 +0800
Subject: [PATCH] 修改上传头像由上传本地改成上传minio 增加用户登录时获取融云token保存到用户
---
ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/IGlobalAlarmService.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/IGlobalAlarmService.java b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/IGlobalAlarmService.java
index a9aaef8..c74748d 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/IGlobalAlarmService.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/IGlobalAlarmService.java
@@ -18,6 +18,6 @@
public List<GlobalAlarmData> selectAlarmLogs(GlobalAlarmCondition condition);
Object updateAlarmViewTime(GlobalAlarmCondition condition);
public void receiveAlarm(String topic,String message);
- public Map<String,Integer> selectAlarmLogsCount();
- Object selectAlarmList(Integer command, String beginTime, String endTime);
+ public Map<String,Object> selectAlarmLogsCount();
+ Object selectAlarmList(Integer command, String beginTime, String endTime,Integer pageNum,Integer pageSize);
}
--
Gitblit v1.9.3