java/IgoTravel.git

igo出行

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

luodangjia

2024-07-17 40bc5a67fe0fa6a01711b7b7a12e38a6272510a8

refs
用户	luodangjia <luodangjia>
	星期三, 七月 17, 2024 15:20 +0800
提交者	luodangjia <luodangjia>
	星期三, 七月 17, 2024 15:20 +0800
提交	40bc5a67fe0fa6a01711b7b7a12e38a6272510a8
目录	3e815404ddd048f9f69f50a3686dd89689edb285 目录 \| zip \| gz
parent	ef543ecfde6b322d8353337bab1c3776daa2976e 查看 \| 对比 49e88798dcea0164f77c59f0be9eefdf67a3d228 查看 \| 对比

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

16个文件已修改

	ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java	54 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityController.java	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java	220 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSystemPriceMapper.java	15 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSystemPriceMapper.xml	28 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivity.java	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivityOnline.java	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPrivateCar.java	34 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSystemPriceService.java	7 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java	10 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSystemPriceServiceImpl.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_detail.html	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_edit.html	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tOrderPrivateCar/tOrderPrivateCar.js	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史