From f342a0d88b2a7168f794d0cf545d16a3138acb6d Mon Sep 17 00:00:00 2001
From: wuqiping <wuqiping@qq.com>
Date: Wed, 09 Jun 2021 15:55:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-manage/src/main/resources/mapper/OrganizationMapper.xml | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/screen-manage/src/main/resources/mapper/OrganizationMapper.xml b/screen-manage/src/main/resources/mapper/OrganizationMapper.xml
index de7e2ec..7dca616 100644
--- a/screen-manage/src/main/resources/mapper/OrganizationMapper.xml
+++ b/screen-manage/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" />
--
Gitblit v1.8.0