From 3771512ff8b1f4bd6c40cdcdff58b3a64cee78b1 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Tue, 14 Nov 2023 13:50:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/qa' into qa

---
 screen-job/src/main/resources/mapper/DeviceMapper.xml |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/screen-job/src/main/resources/mapper/DeviceMapper.xml b/screen-job/src/main/resources/mapper/DeviceMapper.xml
index a44b860..f3c46db 100644
--- a/screen-job/src/main/resources/mapper/DeviceMapper.xml
+++ b/screen-job/src/main/resources/mapper/DeviceMapper.xml
@@ -25,6 +25,7 @@
         <result column="install_time" property="installTime"/>
         <result column="is_delete" property="isDelete"/>
         <result column="extend" property="extend"/>
+        <result column="town_code" property="townCode"/>
     </resultMap>
 
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0