明星电力充电桩
parent: de3155 | 补丁 | 提交对比
puzhibing
2024-09-11 c17841d2e942bebbe633e02c923ac9e8402b3bc9
refs
用户 puzhibing <393733352@qq.com>
星期三, 九月 11, 2024 17:42 +0800
提交者 puzhibing <393733352@qq.com>
星期三, 九月 11, 2024 17:42 +0800
提交c17841d2e942bebbe633e02c923ac9e8402b3bc9
目录 e5de7a48535daa06b92fbfb5ea98ff33998b4c1a 目录 | zip | gz
parent de31553ec8f08f9e859dd88fbfbf66cc07405311 查看 | 对比 
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
4个文件已修改
40 ■■■■■ 已修改文件
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/ExchangeRecordVO.java 4 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppCouponServiceImpl.java 28 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TExchangeOrderController.java 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java 6 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史