ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml · 9211d2adb2a2a069a8477b298297116e9236005b · youjj / cloud-platform

Merge remote-tracking branch 'origin/base-modify' into base-modify · 91bf3bac

libin authored Sep 16, 2019

# Conflicts:
#	ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml
#	xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml

91bf3bac

AppUserDetailMapper.xml 5.81 KB

Replace AppUserDetailMapper.xml