From f80e452fa31bf48257d4897a937747f211c91790 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 09 Aug 2023 13:49:47 +0800
Subject: [PATCH] chore:dev部分环境变化
---
screen-manage/src/main/java/com/moral/api/entity/Device.java | 23 +++++++++++++++++++----
1 files changed, 19 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..0fb249f 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,18 @@
*/
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