From f979b967a74bfdbfe7d2913a35ba98344838e59b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 14 Sep 2023 12:56:58 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

---
 screen-job/src/main/java/com/moral/api/entity/Device.java |    5 +++++
 1 files changed, 5 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 f055d6b..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
@@ -129,6 +129,11 @@
      */
     private String extend;
 
+    /**
+     * ���������������code
+     */
+    private Integer townCode;
+
 
     @Override
     protected Serializable pkVal() {

--
Gitblit v1.8.0