java/QianYunTong.git

Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-07-23 2ab5f166d0fad4b1a860fde3bab1adb46d062c3f

refs
用户	Pu Zhibing <393733352@qq.com>
	星期三, 七月 23, 2025 21:18 +0800
提交者	Pu Zhibing <393733352@qq.com>
	星期三, 七月 23, 2025 21:18 +0800
提交	2ab5f166d0fad4b1a860fde3bab1adb46d062c3f
目录	d712bfd98aedb6a65f3b3e8e494779332c50c5e5 目录 \| zip \| gz
parent	127c4d704298c4ed4ca00acaa6f722ddf881b01e 查看 \| 对比 9ac52631cc628cd01d4c761ed9467963447d4f9a 查看 \| 对比

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCrossCityController.java

41个文件已修改

25个文件已添加

	DriverQYTTravel/guns-admin/pom.xml	8 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java	75 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/CarMapper.java	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CarMapper.xml	9 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Driver.java	70 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Region.java	33 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/vo/CompanyVo.java	17 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java	31 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java	22 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java	93 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/RongCloudUtil.java	608 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/LoginWarpper.java	10 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/RegisteredWarpper.java	65 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverQYTTravel/guns-admin/src/main/resources/application-dev.yml	20 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TAbnormalOrderCarController.java	720 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TAbnormalOrderPayCarController.java	183 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCrossCityController.java	282 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java	307 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/taxi/TOrderTaxiController.java	269 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TAbnormalPayOrderMapper.java	23 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderCrossCityMapper.java	25 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderPrivateCarMapper.java	25 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderTaxiMapper.java	41 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/RoleMapper.xml	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TAbnormalPayOrderMapper.xml	39 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderCrossCityMapper.xml	85 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml	83 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderTaxiMapper.xml	73 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TAbnormalPayOrder.java	82 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderCrossCity.java	41 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPrivateCar.java	40 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderTaxi.java	40 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderCrossCityService.java	25 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderPrivateCarService.java	25 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderTaxiService.java	24 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/TAbnormalPayOrderService.java	24 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAbnormalPayOrderServiceImpl.java	35 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderCrossCityServiceImpl.java	14 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderPrivateCarServiceImpl.java	32 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderTaxiServiceImpl.java	13 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/CellType.java	45 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ExcelUtil.java	351 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAbnormalOrderCar/tAbnormalOrder.html	90 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAbnormalOrderCar/tAbnormalOrder_orderDetail.html	421 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAbnormalOrderCar/tOrderPrivateCar_add.html	487 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAbnormalOrderCar/tOrderPrivateCar_trajectory.html	57 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAbnormalPayOrderCar/tAbnormalOrder.html	60 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAbnormalPayOrderCar/tAbnormalOrder_orderDetail.html	271 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAbnormalPayOrderCar/tOrderPrivateCar_add.html	487 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAbnormalPayOrderCar/tOrderPrivateCar_trajectory.html	57 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity.html	20 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity_detail.html	67 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar.html	23 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_orderDetail.html	65 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi.html	22 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_edit.html	67 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tAbnormalOrderCar/tAbnormalOrder.js	478 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tAbnormalOrderCar/tAbnormalOrderCar_info.js	312 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tAbnormalPayOrderCar/tAbnormalOrder.js	264 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tAbnormalPayOrderCar/tAbnormalOrderCar_info.js	287 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderCrossCity/tOrderCrossCity.js	91 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderPrivateCar/tOrderPrivateCar.js	92 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderTaxi/tOrderTaxi.js	85 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/trPrivateOrdeCar/tOrderPrivateCar.js	434 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/trPrivateOrdeCar/tOrderPrivateCar_info.js	287 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史