From 9d4e322f4d4d8c1b941185c7c95d6df08937aff1 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Sat, 20 Mar 2021 18:00:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java
index 1c518de..5c0cb30 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java
@@ -394,7 +394,7 @@
types = Arrays.asList(type);
//获取时间集合数据(今天及今天之前6天的日期)
times = DateUtils.pastDay(new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
- //1.统计7天内一键求助警情数量数据
+ //1.统计7天内一键求助警情数量数据 3-20 修改展示紧急求助
Map<String,Object> alarmData = alarmService.selectAlarmData();
alarmData.put("name","一键求助");
//2.统计7天内违禁品的数量数据
--
Gitblit v1.9.3