From ba9c4bca1bdf36f827ab258222d92c885ff890db Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 05 Sep 2023 08:43:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa

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

diff --git a/screen-manage/src/main/resources/mapper/DeviceMapper.xml b/screen-manage/src/main/resources/mapper/DeviceMapper.xml
index 28466d5..f394f1e 100644
--- a/screen-manage/src/main/resources/mapper/DeviceMapper.xml
+++ b/screen-manage/src/main/resources/mapper/DeviceMapper.xml
@@ -26,6 +26,7 @@
         <result column="is_delete" property="isDelete"/>
         <result column="extend" property="extend"/>
         <result column="town_code" property="townCode"/>
+        <result column="dev_num" property="devNum"/>
     </resultMap>
 
     <resultMap id="resultMap" type="com.moral.api.pojo.vo.device.DeviceVO" extends="BaseResultMap">

--
Gitblit v1.8.0