From e5afbe8d4feccaf34bce709402ed9eb0b4ef9159 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sun, 27 Jun 2021 22:57:17 +0800
Subject: [PATCH] 1.设备统计代码同步修改 2.考勤模糊查询代码同步修改

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java
index fb80f99..75ddcc4 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java
@@ -97,7 +97,7 @@
 
 	List<AlarmVO> getAlarm(@Param("alarm") AlarmVO alarm);
 
-	List<Map<String, Object>> getAlarming(@Param("alarm") AlarmVO alarm);
+	List<AlarmVO> getAlarming(@Param("alarm") AlarmVO alarm);
 
 	boolean setAlarm(@Param("alarm") AlarmVO alarm);
 

--
Gitblit v1.9.3