From 239927b057f65a040594f7a4cb08c8881b303797 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 18 Aug 2023 14:52:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl-230812' into cjl-230812
---
screen-api/src/main/java/com/moral/api/entity/SpecialDevice.java | 17 +++++++++++++++--
1 files changed, 15 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 c561375..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
@@ -1,6 +1,7 @@
package com.moral.api.entity;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableId;
import java.io.Serializable;
@@ -11,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
@@ -38,6 +40,11 @@
* mac���
*/
private String mac;
+
+ /**
+ * ������������id
+ */
+ private String guid;
/**
* ���������id���������������������������������manage_account
@@ -74,6 +81,12 @@
*/
private String isDelete;
+ /*
+ * ������������
+ * */
+ @TableField(exist = false)
+ private Version version;
+
@Override
protected Serializable pkVal() {
--
Gitblit v1.8.0