From f4ab89e7032bea8d3c7e05a44946c3fdb58b7473 Mon Sep 17 00:00:00 2001
From: chen_xi <276999030@qq.com>
Date: Tue, 27 Sep 2022 11:15:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 screen-manage/src/main/java/com/moral/api/entity/Device.java |    5 +++++
 1 files changed, 5 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 c978a90..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
@@ -135,6 +135,11 @@
      */
     private String extend;
 
+    /**
+     * ���������������code
+     */
+    private Integer townCode;
+
     /*
     * ������������
     * */

--
Gitblit v1.8.0