From 3b4574cf01b839bdac2ef5647a106185d709dd71 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 21 Jul 2023 15:54:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into dev
---
screen-manage/src/main/java/com/moral/api/entity/Device.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 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 f933fe0..ccf7d28 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,6 +135,11 @@
*/
private String extend;
+ /**
+ * ���������������code
+ */
+ private Integer townCode;
+
/*
* ������������
* */
--
Gitblit v1.8.0