From a4f88904d8cc67818801b353ba684810125dc8d1 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 08 Nov 2021 17:30:28 +0800
Subject: [PATCH] update

---
 screen-api/src/main/java/com/moral/api/entity/Device.java |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/entity/Device.java b/screen-api/src/main/java/com/moral/api/entity/Device.java
index 63226a2..beec53d 100644
--- a/screen-api/src/main/java/com/moral/api/entity/Device.java
+++ b/screen-api/src/main/java/com/moral/api/entity/Device.java
@@ -78,6 +78,11 @@
     private Integer organizationId;
 
     /**
+     * ���������/���������/���������������������gov_monitor_point���guid������
+     */
+    private String guid;
+
+    /**
      * ������������id
      */
     private Integer deviceVersionId;
@@ -136,10 +141,7 @@
     @TableField(exist = false)
     private Version version;
 
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
+
 
 
 }

--
Gitblit v1.8.0