明星电力充电桩
parent: a738f7 | 补丁 | 提交对比
puzhibing
2024-09-12 bd8fb523bf602ce9371c274830dfe0ceb31e1311
refs
用户 puzhibing <393733352@qq.com>
星期四, 九月 12, 2024 09:48 +0800
提交者 puzhibing <393733352@qq.com>
星期四, 九月 12, 2024 09:48 +0800
提交bd8fb523bf602ce9371c274830dfe0ceb31e1311
目录 cd48b6e7fb7275beafdaa714090a077313aac0b5 目录 | zip | gz
parent a738f7d328e037abe189c14c94d7ef835bf8296c 查看 | 对比 
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个文件已修改
12 ■■■■■ 已修改文件
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/ExchangeRecordVO.java 1 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/factory/ChargingPileFallbackFactory.java 5 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppCouponServiceImpl.java 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java 4 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史