java/QianYunTong.git

黔云通

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

Pu Zhibing

2026-01-12 3cd30ccaeab2161102ac1f68c44b04747c62cc03

refs
用户	Pu Zhibing <393733352@qq.com>
	星期一, 一月 12, 2026 18:58 +0800
提交者	Pu Zhibing <393733352@qq.com>
	星期一, 一月 12, 2026 18:58 +0800
提交	3cd30ccaeab2161102ac1f68c44b04747c62cc03
目录	900e0a87fe30fe63d6a1f009629bd281738924d6 目录 \| zip \| gz
parent	e4a2491c5fa3b7c69004fae2b0799845e7ef77b7 查看 \| 对比 b5ee0c2205ed57cbd9d11726186a6131fd3bd802 查看 \| 对比

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

1个文件已添加

10个文件已修改

	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/CrossCityShiftController.java	33 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/OrderCrossCityController.java	27 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/LineShiftDriverServiceImpl.java	32 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/warpper/DriverShiftListWarpper.java	11 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/OrderCrossCityController.java	24 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/LineShiftDriverMapper.java	10 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/mapping/LineShiftDriverMapper.xml	46 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/IOrderCrossCityService.java	10 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java	63 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/warpper/ScanOrderDetailWarpper.java	90 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史