From 547b51661fefe8d7b88640b29a60db8874f5efac Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 14 Mar 2022 16:27:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-manage/src/main/java/com/moral/api/entity/SpecialDeviceHistory.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/entity/SpecialDeviceHistory.java b/screen-manage/src/main/java/com/moral/api/entity/SpecialDeviceHistory.java
index 00d1962..3ab7621 100644
--- a/screen-manage/src/main/java/com/moral/api/entity/SpecialDeviceHistory.java
+++ b/screen-manage/src/main/java/com/moral/api/entity/SpecialDeviceHistory.java
@@ -41,6 +41,11 @@
private String mac;
/**
+ * ������������id
+ */
+ private String guid;
+
+ /**
* ���������id���������������������������������manage_account
*/
private String operateIds;
--
Gitblit v1.8.0