Pu Zhibing
2025-08-16 0c41f99c7f1a0d7deeeef23a5b3b890aed32ce63
refs
用户 Pu Zhibing <393733352@qq.com>
星期六, 八月 16, 2025 09:20 +0800
提交者 Pu Zhibing <393733352@qq.com>
星期六, 八月 16, 2025 09:20 +0800
提交0c41f99c7f1a0d7deeeef23a5b3b890aed32ce63
目录 b7406b6f8264457d96452b318c32ef9e180dad0f 目录 | zip | gz
parent 8522e469e00e1cf6c0410165b0f76c806c13ca83 查看 | 对比
5e7bf77a48a2803eaa8c5a3b301ad2aac5b70100 查看 | 对比
Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong

# Conflicts:
# UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
5个文件已修改
36 ■■■■ 已修改文件
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CarMapper.xml 2 ●●● 对比 | 查看 | 原始文档 | blame | 历史
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java 19 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TAbnormalOrderCarController.java 6 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java 5 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java 4 ●●●● 对比 | 查看 | 原始文档 | blame | 历史