xx-order/xx-order-server/src/main/resources/mapper · 7c6a4e8a40cc1a1756252aafea46a2960e55c53e · youjj / cloud-platform

Merge remote-tracking branch 'origin/master' into master-member-feture-count · 7c6a4e8a

libin authored Oct 31, 2019

# Conflicts:
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserLoginBiz.java
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUserController.java

7c6a4e8a

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...
OrderAccountMapper.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...