java/ZhaoYangChuXing.git

昭阳出行

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

无关风月

2025-08-05 9cf6d184a1b8a3a2a951a6842a586906747d46cd

refs
用户	无关风月 <443237572@qq.com>
	星期二, 八月 5, 2025 20:56 +0800
提交者	无关风月 <443237572@qq.com>
	星期二, 八月 5, 2025 20:56 +0800
提交	9cf6d184a1b8a3a2a951a6842a586906747d46cd
目录	45821d7fad116a3e6b18e640be91e527347733d1 目录 \| zip \| gz
parent	accbb6091a09327389f2d9363921213951eefdb6 查看 \| 对比 74aaaab01e109d3f408cf586ea2c4661872190f1 查看 \| 对比

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

16个文件已修改

2个文件已添加

	DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverAlipayController.java	28 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java	36 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java	61 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverAlipay.java	14 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverAlipayService.java	10 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverAlipayServiceImpl.java	127 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementZYTravel/guns-admin/pom.xml	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOpenCity.java	14 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/alipay/AlipayProperties.java	63 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/alipay/AlipayUtils.java	118 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementZYTravel/guns-admin/src/main/resources/application.yml	11 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java	48 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/controller/OrderPrivateCarController.java	70 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java	37 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/IOrderPrivateCarService.java	23 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java	903 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OpenCity.java	14 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/BaseWarpper.java	11 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史