From 1cbd89e5aceb71e990c42b8599e45f2703588878 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Mon, 06 Nov 2017 13:39:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/OrganizationMapper.xml | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/OrganizationMapper.xml b/src/main/resources/mapper/OrganizationMapper.xml
index f4a657d..13179b1 100644
--- a/src/main/resources/mapper/OrganizationMapper.xml
+++ b/src/main/resources/mapper/OrganizationMapper.xml
@@ -86,8 +86,9 @@
<if test="distinct" >
distinct
</if>
- <include refid="Base_Column_List" />
+ organization.*
from organization
+ LEFT JOIN area ON organization.areacode = area.`code`
<if test="_parameter != null" >
<include refid="Example_Where_Clause" />
</if>
--
Gitblit v1.8.0