Merge remote-tracking branch 'origin/master'

沈斌

2018-02-02 e60f6e849f43cb894fb96646de71304cf2524827

 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;