From 2d4d397ce9ea8e53d4a63b6463c02a7586fb27ea Mon Sep 17 00:00:00 2001 From: ZhuDongming <773644075@qq.com> Date: Thu, 08 Aug 2019 17:03:55 +0800 Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2 --- src/main/java/com/moral/entity/Alarm.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/moral/entity/Alarm.java b/src/main/java/com/moral/entity/Alarm.java index 55f7f2f..d68981b 100644 --- a/src/main/java/com/moral/entity/Alarm.java +++ b/src/main/java/com/moral/entity/Alarm.java @@ -14,7 +14,7 @@ * @mbg.generated Mon Apr 16 09:27:36 CST 2018 */ private String mac; - + private Integer state; /** * * This field was generated by MyBatis Generator. -- Gitblit v1.8.0