From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:18:30 +0800
Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.
---
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