From 51c36e6f6b17862714fbd5c42da43386dc05d28a Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 09 Apr 2021 14:32:29 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-api/src/main/resources/mapper/OrganizationMapper.xml | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/OrganizationMapper.xml b/screen-api/src/main/resources/mapper/OrganizationMapper.xml
index 9f4ec9b..e6490b9 100644
--- a/screen-api/src/main/resources/mapper/OrganizationMapper.xml
+++ b/screen-api/src/main/resources/mapper/OrganizationMapper.xml
@@ -9,11 +9,13 @@
<result column="admin_user_id" property="adminUserId"/>
<result column="name" property="name"/>
<result column="province_code" property="provinceCode"/>
+ <result column="province_name" property="provinceName"/>
<result column="city_code" property="cityCode"/>
+ <result column="city_name" property="cityName"/>
<result column="area_code" property="areaCode"/>
- <result column="town_code" property="townCode"/>
- <result column="village_code" property="villageCode"/>
- <result column="location_level" property="locationLevel"/>
+ <result column="area_name" property="areaName"/>
+ <result column="location_level_code" property="locationLevelCode"/>
+ <result column="location_level_name" property="locationLevelName"/>
<result column="address" property="address"/>
<result column="phone" property="phone"/>
<result column="email" property="email"/>
@@ -24,7 +26,4 @@
<result column="is_delete" property="isDelete"/>
</resultMap>
- <select id="selectOrganizationById" resultType="java.util.Map">
- SELECT * FROM organization WHERE id= #{orgId}
- </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0