From eb51b2364e9a3fbe806fde61fa255660a098fc8b Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 24 Jun 2021 14:06:41 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-manage/src/main/resources/mapper/DeviceMapper.xml | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/screen-manage/src/main/resources/mapper/DeviceMapper.xml b/screen-manage/src/main/resources/mapper/DeviceMapper.xml
index 6e7f549..d1c0809 100644
--- a/screen-manage/src/main/resources/mapper/DeviceMapper.xml
+++ b/screen-manage/src/main/resources/mapper/DeviceMapper.xml
@@ -49,7 +49,9 @@
<association property="monitorPoint" javaType="com.moral.api.entity.MonitorPoint">
<result column="mp_id" property="id"/>
<result column="mp_name" property="name"/>
- <result column="mp_address" property="address"/>
+ <result column="mp_area_code" property="areaCode"/>
+ <result column="mp_city_code" property="cityCode"/>
+ <result column="mp_province_code" property="provinceCode"/>
</association>
<!--������-->
@@ -116,7 +118,9 @@
o.`name` org_name,
mp.id mp_id,
mp.`name` mp_name,
- mp.address mp_address,
+ mp.area_code mp_area_code,
+ mp.city_code mp_city_code,
+ mp.province_code mp_province_code,
ma.id operate_id,
v.id version_id,
v.`name` version_name,
--
Gitblit v1.8.0