From d56ba0ec51cf2b0afa00bbf6ddb0c02ac16393fa Mon Sep 17 00:00:00 2001
From: swb <jpy123456>
Date: Mon, 26 Aug 2024 11:16:55 +0800
Subject: [PATCH] fix:分页查询设备接口修改提交

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

--
Gitblit v1.8.0