From 7a52cd14e12e5b1053a26ed5a4799da7a09d4b16 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 24 Jul 2018 11:51:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/moral/controller/AlarmConfigController.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/moral/controller/AlarmConfigController.java b/src/main/java/com/moral/controller/AlarmConfigController.java
index 7d5cecd..3dd8a98 100644
--- a/src/main/java/com/moral/controller/AlarmConfigController.java
+++ b/src/main/java/com/moral/controller/AlarmConfigController.java
@@ -4,10 +4,12 @@
 import com.moral.common.bean.ResultBean;
 import com.moral.common.util.RedisUtil;
 import com.moral.entity.alarm.AlarmConfig;
+import com.moral.entity.alarm.AlarmSensorLevel;
 import com.moral.service.AlarmConfigService;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.Map;
 
 @RestController
 @RequestMapping("alarm-config")

--
Gitblit v1.8.0