Merge remote-tracking branch 'origin/master'

kaiyu

2020-11-18 8dc1a393928b0195bf0b5a6d6f8daec6e4a043b1

 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;