From eb6d41359a8957c6355275f7697db202d6a523db Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 11 Aug 2023 14:29:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
screen-api/src/main/resources/mapper/DeviceMapper.xml | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/DeviceMapper.xml b/screen-api/src/main/resources/mapper/DeviceMapper.xml
index ce3522f..04fd460 100644
--- a/screen-api/src/main/resources/mapper/DeviceMapper.xml
+++ b/screen-api/src/main/resources/mapper/DeviceMapper.xml
@@ -25,6 +25,8 @@
<result column="install_time" property="installTime"/>
<result column="is_delete" property="isDelete"/>
<result column="extend" property="extend"/>
+ <result column="town_code" property="townCode"/>
+ <result column="dev_num" property="devNum"/>
</resultMap>
<!--���������������������������-->
--
Gitblit v1.8.0