From c3f394fc6d624170d5a0cddff57b7a259fda3f0a Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 17 九月 2019 12:12:49 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/mapping/ExtractMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/ExtractMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/ExtractMapper.xml
index 38f9bae..3ceb70e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/ExtractMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/ExtractMapper.xml
@@ -16,7 +16,7 @@
 		<result column="adminId" property="adminId" jdbcType="BIGINT" />
 
 		<association property="userInfo" column="uid"
-			select="com.yeshi.fanli.dao.mybatis.UserInfoMapper.selectByPKey">
+			select="com.yeshi.fanli.dao.mybatis.UserInfoMapper.selectByPrimaryKey">
 		</association>
 
 		<association property="system" column="sid"

--
Gitblit v1.8.0