From 7e5452d35bb30dad5bc9e37360047b5a43732dcd Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 27 Jul 2023 15:35:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into dev
---
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