java/QianYunTong.git

黔云通

Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-08-01 92480c7fd17a6bf89205ffcf4b78eef17988f0d5

refs
用户	Pu Zhibing <393733352@qq.com>
	星期五, 八月 1, 2025 19:22 +0800
提交者	Pu Zhibing <393733352@qq.com>
	星期五, 八月 1, 2025 19:22 +0800
提交	92480c7fd17a6bf89205ffcf4b78eef17988f0d5
目录	f92832341a9e60ee3c4025e632d9456f0039a8c8 目录 \| zip \| gz
parent	38a87f638d7d0bf0a734053afc060b91bc742567 查看 \| 对比 5758a897b9985c4d4d7ef166b2c0cb40717e9913 查看 \| 对比

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java

15个文件已修改

2个文件已添加

	ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TInvoiceController.java	8 ●●●●● 对比 \| 查看 \| 原始文档 \| 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/TInvoiceMapper.java	3 ●●●●● 对比 \| 查看 \| 原始文档 \| 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/TInvoiceMapper.xml	1 ●●●●● 对比 \| 查看 \| 原始文档 \| 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/ITInvoiceService.java	3 ●●●●● 对比 \| 查看 \| 原始文档 \| 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/TInvoiceServiceImpl.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	14 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Invoice.java	11 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/InvoiceServiceImpl.java	159 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史