From 5c1d58556e9cd4c7603b5e16dc1640f61623af0b Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 08 Nov 2023 11:47:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into dev
---
screen-api/src/main/java/com/moral/api/entity/SpecialDevice.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/entity/SpecialDevice.java b/screen-api/src/main/java/com/moral/api/entity/SpecialDevice.java
index 99df6fb..34310b9 100644
--- a/screen-api/src/main/java/com/moral/api/entity/SpecialDevice.java
+++ b/screen-api/src/main/java/com/moral/api/entity/SpecialDevice.java
@@ -12,17 +12,18 @@
/**
* <p>
- *
+ *
* </p>
*
* @author moral
- * @since 2021-08-18
+ * @since 2021-08-11
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class SpecialDevice extends Model<SpecialDevice> {
private static final long serialVersionUID = 1L;
+
/**
* id
@@ -41,6 +42,11 @@
private String mac;
/**
+ * ������������id
+ */
+ private String guid;
+
+ /**
* ���������id���������������������������������manage_account
*/
private String operateIds;
--
Gitblit v1.8.0