From 83496eec1365c867a6dbf0e24a546935f106ce0a Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 18 Oct 2021 14:35:33 +0800
Subject: [PATCH] screen-aqi            修改实施界面空指针异常Bug

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

diff --git a/screen-manage/src/main/java/com/moral/api/entity/Device.java b/screen-manage/src/main/java/com/moral/api/entity/Device.java
index 646024a..c978a90 100644
--- a/screen-manage/src/main/java/com/moral/api/entity/Device.java
+++ b/screen-manage/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,9 +141,5 @@
     @TableField(exist = false)
     private Version version;
 
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
 
 }

--
Gitblit v1.8.0