Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2.git

xufenglei

2018-03-26 b4aa377b5e7898cd2ef018cc385a19af67a56839

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

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