From 2d4d397ce9ea8e53d4a63b6463c02a7586fb27ea Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Thu, 08 Aug 2019 17:03:55 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
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