Merge branch 'master' of https://github.com/java110/MicroCommunity

wuxw

2019-04-28 2633f776bb8fdb0b1efe3a56293b6a1bb04616a7

 java110-config/src/main/resources/mapper/user/UserServiceDaoImplMapper.xml

@@ -259,7 +259,7 @@

    <!-- 查询用户信息 -->
    <select id="queryUserInfo" parameterType="map" resultType="map">
        select u.user_id,u.name,u.email,u.address,u.password,u.location_cd,
        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
        from u_user u where 1= 1
        <if test="bId != null and bId !=''">