From 6992aaf0587c09f7c511c1afd12e1519d91363d3 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 14 Dec 2023 15:38:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
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