From 51e4f233fd0dfc92c2b8619114aea98322506f18 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 03 Apr 2024 08:56:47 +0800
Subject: [PATCH] fix:经纬度录入补充提交

---
 screen-manage/src/main/java/com/moral/api/entity/Device.java |   24 ++++++++++++++++++++----
 1 files changed, 20 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 b107cba..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
@@ -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 com.fasterxml.jackson.annotation.JsonFormat;
@@ -77,6 +78,11 @@
     private Integer organizationId;
 
     /**
+     * ���������/���������/���������������������gov_monitor_point���guid������
+     */
+    private String guid;
+
+    /**
      * ������������id
      */
     private Integer deviceVersionId;
@@ -129,9 +135,19 @@
      */
     private String extend;
 
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
+    /**
+     * ���������������code
+     */
+    private Integer townCode;
+
+    /*
+    * ������������
+    * */
+    @TableField(exist = false)
+    private Version version;
+    /*
+     *������
+     * */
+    private Integer devNum;
 
 }

--
Gitblit v1.8.0