Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-24 7a52cd14e12e5b1053a26ed5a4799da7a09d4b16

 src/main/java/com/moral/entity/alarm/AlarmMode.java

@@ -10,6 +10,7 @@
@Data
public class AlarmMode {
    private boolean enable;
    private Long interval;
    private List<AlarmStyle> level1;
    private List<AlarmStyle> level2;
    private List<AlarmStyle> level3;