From 57f903e0eb21bd66c88ebc00ccc9d30b49d36f3e Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 03 Aug 2023 13:19:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-manage/src/main/resources/mapper/DeviceMapper.xml | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/screen-manage/src/main/resources/mapper/DeviceMapper.xml b/screen-manage/src/main/resources/mapper/DeviceMapper.xml
index 178e9d0..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">
@@ -67,8 +68,8 @@
<!--������������-->
<association property="town" javaType="java.util.HashMap">
- <result column="town_code" property="areaCode"/>
- <result column="town_name" property="name"/>
+ <result column="town_code" property="townCode"/>
+ <result column="town_name" property="townName"/>
</association>
<!--���������������-->
--
Gitblit v1.8.0