From 5eb88939c094fac1f5dc9201b5af6da4165cc185 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 28 Sep 2023 10:36:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-job/src/main/java/com/moral/api/entity/Device.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/entity/Device.java b/screen-job/src/main/java/com/moral/api/entity/Device.java
index c676a49..de3dc87 100644
--- a/screen-job/src/main/java/com/moral/api/entity/Device.java
+++ b/screen-job/src/main/java/com/moral/api/entity/Device.java
@@ -75,6 +75,11 @@
private Integer organizationId;
/**
+ * ���������/���������/���������������������gov_monitor_point���guid������
+ */
+ private String guid;
+
+ /**
* ������������id
*/
private Integer deviceVersionId;
@@ -124,6 +129,11 @@
*/
private String extend;
+ /**
+ * ���������������code
+ */
+ private Integer townCode;
+
@Override
protected Serializable pkVal() {
--
Gitblit v1.8.0