Merge remote-tracking branch 'origin/caihaohan' into lixuetao

# Conflicts:
#	adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml

adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml

@@ -41,7 +41,7 @@
         <result column="CELLPHONE_NUMBER" property="cellPhoneNumber"/>
         <result column="EMAIL" property="email"/>
         <result column="CREATE_TIME" property="createTime"/>
-        <result column="ORG_Name" property="orgName"/>
+<!--        <result column="ORG_Name" property="orgName"/>-->
     </resultMap>
 
     <resultMap id="UserRoleMap" extends="BaseResultMap" type="com.adc.da.sys.entity.UserEO">
@@ -184,7 +184,7 @@
                  left join TR_USER_ORG uo on users.usid = uo.user_id
                  left join TS_ORG o on uo.org_id = o.id
         where users.del_flag != 1
-        and users.usid = #{usid}
+        and  users.usid=#{usid}
     </select>