Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-12-23 e745dd38c5a413eaa000c7c5434621fbcd1800d5

 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")