java/IgoTravel.git

Merge remote-tracking branch 'origin/2.0' into 2.0

luodangjia

2024-07-17 736ab0090700c75af37b8a3456b01609e4e2d329

refs
用户	luodangjia <luodangjia>
	星期三, 七月 17, 2024 11:09 +0800
提交者	luodangjia <luodangjia>
	星期三, 七月 17, 2024 11:09 +0800
提交	736ab0090700c75af37b8a3456b01609e4e2d329
目录	af8d18d8d93d988022c149d69036669a52aede95 目录 \| zip \| gz
parent	722db9e28a0c8e33d79621c66c0ecf1d60fcf0f6 查看 \| 对比 a290d3c875f1ff6549010703ca95b654d022977d 查看 \| 对比

Merge remote-tracking branch 'origin/2.0' into 2.0

# Conflicts:
#	ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java
#	ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java
#	ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysRedPacketRecordController.java
#	ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java
#	ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSysRedSetMapper.xml
#	ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysCancleOrder.java
#	ManagementIGOTravel/guns-admin/src/main/resources/application-dev.yml
#	ManagementIGOTravel/guns-admin/src/main/resources/application.yml
#	ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/subsidy/grant.html
#	ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/subsidy/use.html
#	ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysRedPacketRecord/sysRedPacketRecord.html
#	ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tRedSetEdit.html
#	ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html
#	ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/platform/water.js
#	ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/subsidy/use.js
#	ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tSysReformist/tRedSet.js

51个文件已添加

126个文件已修改

	DriverIGOTravel/guns-admin/pom.xml	17 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java	15 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java	79 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java	40 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/SettlementRecordController.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/WithdrawalController.java	16 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/OrderLogisticsMapper.java	9 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml	84 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java	686 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/IOrderLogisticsService.java	31 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java	935 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml	25 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java	747 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/IOrderPrivateCarService.java	7 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java	143 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/BalanceUsageRecordMapper.java	37 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/CancleOrderMapper.java	11 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverOnlineMapper.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/ReminderRulesMapper.java	11 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/SettlementRecordMapper.java	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/WithdrawalMapper.java	11 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/BalanceUsageRecordMapper.xml	20 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CancleOrderMapper.xml	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverOnlineMapper.xml	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/ReminderRulesMapper.xml	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/SettlementRecordMapper.xml	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/WithdrawalMapper.xml	15 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/BalanceUsageRecord1.java	48 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/CancleOrder.java	31 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Car.java	205 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivityOnline.java	15 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverOnline.java	15 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/ReminderRules.java	32 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SettlementRecord.java	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IBalanceUsageRecordService.java	43 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ICancleOrderService.java	11 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverOnlineService.java	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IReminderRulesService.java	11 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IWithdrawalService.java	11 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/BalanceUsageRecordServiceImpl.java	101 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CancleOrderServiceImpl.java	15 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverOnlineServiceImpl.java	215 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java	56 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java	79 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReminderRulesServiceImpl.java	15 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SettlementRecordServiceImpl.java	76 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/WithdrawalServiceImpl.java	21 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GoogleMap/FleetEngineUtil.java	894 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GoogleMap/GoogleMapUtil.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java	86 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java	8 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/quartz/QuartzUtil.java	261 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/quartz/SchedulerUtil.java	35 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/quartz/jobs/OrderTimeOutJob.java	134 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/quartz/model/QuartzEnum.java	46 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/quartz/model/QuartzJob.java	108 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/BalanceUsageRecord.java	20 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/BalanceUsageRecordList.java	21 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/DriverInfoWarpper.java	12 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/LoginWarpper.java	11 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/MoneyInfoWarpper.java	163 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java	68 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderListWarpper.java	38 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderStatusWarpper.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/QueryHistoricalSettlement.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/WithdrawalListWarpper.java	101 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/WithdrawalWarpper.java	103 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java	16 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/resources/application-dev.yml	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/resources/application-produce.yml	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/resources/logback-spring.xml	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/resources/quartz.properties	39 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/pom.xml	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java	21 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java	519 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java	7 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java	406 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TIntegralOrderController.java	105 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderLogisticsController.java	12 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java	14 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/BalanceUsageRecordMapper.java	17 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/RedEnvelopePaymentSettingsMapper.java	11 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/BalanceUsageRecordMapper.xml	20 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/RedEnvelopePaymentSettingsMapper.xml	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSysRedSetMapper.xml	9 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/BalanceUsageRecord.java	48 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/RedEnvelopePaymentSettings.java	54 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderLogistics.java	12 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPrivateCar.java	20 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysCancleOrder.java	101 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TUser.java	15 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IBalanceUsageRecordService.java	15 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IRedEnvelopePaymentSettingsService.java	18 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/BalanceUsageRecordServiceImpl.java	24 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/RedEnvelopePaymentSettingsServiceImpl.java	28 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GoogleMap/FleetEngineUtil.java	894 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GoogleMap/GoogleMapUtil.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/src/main/resources/application-dev.yml	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/src/main/resources/application.yml	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/home.html	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/subsidy/grant.html	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/subsidy/use.html	65 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_orderDetail.html	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tRedSetEdit.html	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html	92 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/platform/water.js	10 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/subsidy/use.js	19 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tSysReformist/tRedSet.js	12 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/pom.xml	7 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java	234 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/RedEnvelopeController.java	48 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ServerCarModelController.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java	37 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/WithdrawalController.java	20 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java	325 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/controller/OrderLogisticsController.java	123 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/OrderLogisticsMapper.java	9 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml	48 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java	673 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/IOrderLogisticsService.java	102 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java	2130 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/controller/OrderPrivateCarController.java	35 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/OrderPrivateCarMapper.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml	17 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java	707 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/IOrderPrivateCarService.java	14 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java	483 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/CancleOrderMapper.java	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/CarModelMapper.java	11 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/RedEnvelopePaymentSettingsMapper.java	11 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserRedPacketRecordMapper.java	8 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/WithdrawalMapper.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CancleOrderMapper.xml	16 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CarModelMapper.tld	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/RedEnvelopePaymentSettingsMapper.xml	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserRedPacketRecordMapper.xml	11 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/WithdrawalMapper.xml	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/CancleOrder.java	83 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Car.java	173 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/CarModel.java	120 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Complaint.java	28 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Income.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/RedEnvelopePaymentSettings.java	49 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserRedPacketRecord.java	120 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ICancleOrderService.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IComplaintService.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IRedEnvelopePaymentSettingsService.java	18 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserRedPacketRecordService.java	8 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IWithdrawalService.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CancleOrderServiceImpl.java	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ComplaintServiceImpl.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderEvaluateServiceImpl.java	10 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/RedEnvelopePaymentSettingsServiceImpl.java	28 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserRedPacketRecordServiceImpl.java	10 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/WithdrawalServiceImpl.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GoogleMap/FleetEngineUtil.java	894 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GoogleMap/GoogleMapUtil.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java	152 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/SMSUtil.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/MyRedEnvelope.java	28 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java	612 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderStatusWarpper.java	10 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderTimeInfo.java	28 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderWarpper.java	37 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/TravelRecordListWarpper.java	112 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/TravelRecordWarpper.java	101 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/WithdrawalVo.java	24 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/WithdrawalWarpper.java	35 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java	184 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/resources/application-dev.yml	136 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/resources/application-produce.yml	131 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/resources/application.yml	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/resources/logback-spring.xml	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/pom.xml	12 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史