DZ/faw-report-library-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml
This commit is contained in:
xuetao.li
2023-04-25 21:18:11 +08:00
parent af64620166 ab65fa2fb7
commit 62f0a139b6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml
+1 -1
View File
@@ -41,7 +41,7 @@
<result column="CELLPHONE_NUMBER" property="cellPhoneNumber"/> <result column="CELLPHONE_NUMBER" property="cellPhoneNumber"/>
<result column="EMAIL" property="email"/> <result column="EMAIL" property="email"/>
<result column="CREATE_TIME" property="createTime"/> <result column="CREATE_TIME" property="createTime"/>
<result column="ORG_Name" property="orgName"/> <!-- <result column="ORG_Name" property="orgName"/>-->
</resultMap> </resultMap>
<resultMap id="UserRoleMap" extends="BaseResultMap" type="com.adc.da.sys.entity.UserEO"> <resultMap id="UserRoleMap" extends="BaseResultMap" type="com.adc.da.sys.entity.UserEO">