java/IgoTravel.git

igo出行

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

xuhy

2024-02-06 29d330f60667cb479058cd640049dd6720eb5c87

refs
用户	xuhy <3313886187@qq.com>
	星期二, 二月 6, 2024 17:01 +0800
提交者	xuhy <3313886187@qq.com>
	星期二, 二月 6, 2024 17:01 +0800
提交	29d330f60667cb479058cd640049dd6720eb5c87
目录	182e3aa685208f38f6073d5bdc98dc8f4c3d3400 目录 \| zip \| gz
parent	63b8a90538967f987ed9c43e139502e2375f6522 查看 \| 对比 00af90424cffb4cfec8425a660c52d138630f4c9 查看 \| 对比

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

16个文件已修改

	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java	21 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java	288 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CarBrandMapper.xml	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CarModelMapper.xml	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-core/src/main/java/com/stylefeng/guns/core/util/DateUtil.java	20 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TIntegralOrderController.java	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TIntegralOrderMapper.xml	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserCouponRecordMapper.xml	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TIntegralOrder.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_detail.html	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/userCouponRecord/userCouponRecord.js	8 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementIGOTravel/guns-core/src/main/java/com/stylefeng/guns/core/util/DateUtil.java	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java	207 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史