From 4a64c0801f147536ed0a9d09977941f313a286ae Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 18 Aug 2023 16:19:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into wb
---
screen-manage/src/main/java/com/moral/api/entity/SpecialDevice.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/entity/SpecialDevice.java b/screen-manage/src/main/java/com/moral/api/entity/SpecialDevice.java
index b5a7266..0aa87ea 100644
--- a/screen-manage/src/main/java/com/moral/api/entity/SpecialDevice.java
+++ b/screen-manage/src/main/java/com/moral/api/entity/SpecialDevice.java
@@ -42,6 +42,11 @@
private String mac;
/**
+ * ������������id
+ */
+ private String guid;
+
+ /**
* ���������id���������������������������������manage_account
*/
private String operateIds;
--
Gitblit v1.8.0