From 4f9c122f237fbee16d5ef9c602b6db95d28ed7b0 Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期一, 10 二月 2020 14:35:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
java110-db/src/main/resources/mapper/user/UserServiceDaoImplMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/user/UserServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/user/UserServiceDaoImplMapper.xml
index 0549036..5b26193 100644
--- a/java110-db/src/main/resources/mapper/user/UserServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/UserServiceDaoImplMapper.xml
@@ -576,7 +576,7 @@
<!-- 鏌ヨ鐢ㄦ埛瀵嗙爜 -->
<select id="getUserHasPwd" parameterType="Map" resultType="Map">
select u.user_id, u.user_id userId,u.name,u.name userName,u.email,u.address,u.password,u.location_cd,u.location_cd locationCd,
- u.age,u.sex,u.tel,u.level_cd,u.b_id,u.password
+ u.age,u.sex,u.tel,u.level_cd levelCd,u.b_id,u.password
from u_user u
<if test="openId != null and openId !=''">
,u_user_attr ua
--
Gitblit v1.8.0