Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-31 455498f1454449bfd127a560eeb01ffff823a6ca

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

@@ -9,7 +9,8 @@
 */
@Data
public class AlarmMode {
    private int enable;
    private boolean enable;
    private Long interval;
    private List<AlarmStyle> level1;
    private List<AlarmStyle> level2;
    private List<AlarmStyle> level3;