From 03791ab057f15d102bc20b83c687f8a8028a4b8f Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 28 Dec 2021 13:47:38 +0800
Subject: [PATCH] 行业贡献率update

---
 screen-api/src/main/java/com/moral/api/entity/Device.java |   15 +++++++++++----
 1 files changed, 11 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..401ade5 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;
@@ -130,16 +135,18 @@
      */
     private String extend;
 
+    /**
+     * ���������������code
+     */
+    private Integer townCode;
+
     /*
      * ������������
      * */
     @TableField(exist = false)
     private Version version;
 
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
+
 
 
 }

--
Gitblit v1.8.0