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