java/QianYunTong.git

黔云通

Merge remote-tracking branch 'origin/master'

guyue

2025-08-01 ba165ef7ca1573df70dc66b786da6be4eb60380b

refs
用户	guyue <1721849008@qq.com>
	星期五, 八月 1, 2025 19:05 +0800
提交者	guyue <1721849008@qq.com>
	星期五, 八月 1, 2025 19:05 +0800
提交	ba165ef7ca1573df70dc66b786da6be4eb60380b
目录	aef7774fe00c344c9da65d0e68376b2334d32fa5 目录 \| zip \| gz
parent	e9771fd8d8c68eb6753ce19726286302a64bbc5f 查看 \| 对比 a0a814be1a2cff11a4eea699930b7df4b56ccacb 查看 \| 对比

Merge remote-tracking branch 'origin/master'

19个文件已修改

2个文件已添加

	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java	8 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongProperties.java	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TDriverPromotionActivityController.java	17 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TPromotionOrderCarController.java	12 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderPrivateCarMapper.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml	24 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderPrivateCarService.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderPrivateCarServiceImpl.java	8 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriverPromotionActivity/tPromotionOrder.html	122 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tDriverPromotionActivity/tDriverPromotionActivity1.js	17 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tDriverPromotionActivity/tPromotionOrder.js	271 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java	45 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java	201 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/OrderUtil.java	15 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/CreateOrderRequest.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/TradeOrderCreateData.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/TradePayOff1Data.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/model/TradePayOffData.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/model/OrderTaxi.java	2271 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/IPaymentRecordService.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史