From 3271a0e7421aa7c55f475be8f24ad85b576108b8 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 22 Sep 2023 16:17:16 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

---
 screen-manage/src/main/java/com/moral/api/entity/Device.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 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..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
@@ -135,11 +135,18 @@
      */
     private String extend;
 
+    /**
+     * ���������������code
+     */
+    private Integer townCode;
+
     /*
     * ������������
     * */
     @TableField(exist = false)
     private Version version;
-
-
+    /*
+     *������
+     * */
+    private Integer devNum;
 }

--
Gitblit v1.8.0