xx-order/xx-order-server/src/main/resources/mapper · 91bf3bac95582f6887de9c8c8f3fd6376f56cdfc · 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

Name	Last commit	Last update
..
BaseOrderMapper.xml		Loading commit data...
DailyMembersOrderStatisticsMapper.xml		Loading commit data...
DailyTravelOrderStatisticsMapper.xml		Loading commit data...
DailyVehicleOrderStatisticsMapper.xml		Loading commit data...
DepositRefundRecordMapper.xml		Loading commit data...
OrderCostDetailMapper.xml		Loading commit data...
OrderItemMapper.xml		Loading commit data...
OrderLogMapper.xml		Loading commit data...
OrderMemberDetailMapper.xml		Loading commit data...
OrderRefundMapper.xml		Loading commit data...
OrderRentVehicleDetailMapper.xml		Loading commit data...
OrderTourDetailMapper.xml		Loading commit data...
OrderTourVerificationMapper.xml		Loading commit data...
OrderUserLicenseMapper.xml		Loading commit data...
OrderVehicaleCrosstownMapper.xml		Loading commit data...
orderViolationMapper.xml		Loading commit data...