明星电力充电桩
parent: 08564a | 补丁 | 提交对比
puzhibing
2024-09-12 528b6a86774578bff04a0571b874c8723f89f74f
refs
用户 puzhibing <393733352@qq.com>
星期四, 九月 12, 2024 17:53 +0800
提交者 puzhibing <393733352@qq.com>
星期四, 九月 12, 2024 17:53 +0800
提交528b6a86774578bff04a0571b874c8723f89f74f
目录 b86bb0d5a7c559eadb6dfb71192ccab64fea3218 目录 | zip | gz
parent 08564aa83ad1b664eff494e34b1fb73d009dde7c 查看 | 对比 
Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile

# Conflicts:
#	ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
6个文件已修改
39 ■■■■■ 已修改文件
ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/feignClient/WxPaymentClient.java 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserIntegralChangeController.java 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/ParkingOrderService.java 4 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java 12 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderInvoiceServiceImpl.java 17 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史