超省新代驾
parent: 06057d | 补丁 | 提交对比
puzhibing
2023-06-03 9c19d5222d91bb191808d868aa056bfedbacb0c9
refs
用户 puzhibing <393733352@qq.com>
星期六, 六月 3, 2023 02:07 +0800
提交者 puzhibing <393733352@qq.com>
星期六, 六月 3, 2023 02:07 +0800
提交9c19d5222d91bb191808d868aa056bfedbacb0c9
目录 f3e44ffeae72192a638662dcdebb0a1b4bd2731c 目录 | zip | gz
parent 06057d33c65653f80ccf716a396b89052e2d8eb6 查看 | 对比
ddd4919fdd5c5dd4fc96eb99e590403cad58bbd7 查看 | 对比 
Merge remote-tracking branch 'origin/1.1' into 1.1

# Conflicts:
#	driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Agent.java
7个文件已修改
1个文件已添加
952 ■■■■■ 已修改文件
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/OrderController.java 44 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IOrderService.java 3 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/AccountChangeDetailServiceImpl.java 104 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java 499 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/model/Transfer.java 76 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/OrderController.java 54 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/Order.java 7 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java 165 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史