明星电力充电桩
parent: d2e925 | 补丁 | 提交对比
puzhibing
2024-09-12 865d7207dc782013e58023e886d5cffa4d5c3893
refs
用户 puzhibing <393733352@qq.com>
星期四, 九月 12, 2024 14:55 +0800
提交者 puzhibing <393733352@qq.com>
星期四, 九月 12, 2024 14:55 +0800
提交865d7207dc782013e58023e886d5cffa4d5c3893
目录 ef90769522f387b23dda4c97d2c02e8f1e670069 目录 | zip | gz
parent d2e925fa82f16555801262691f3982c42f2140d0 查看 | 对比 
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
9个文件已修改
39 ■■■■■ 已修改文件
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserIntegralChange.java 1 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-payment/src/main/java/com/ruoyi/payment/api/vo/PaymentOrder.java 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TExchangeOrderServiceImpl.java 3 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderInvoiceServiceImpl.java 3 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java 6 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingBillMapper.xml 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml 13 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TSettlementConfirmMapper.xml 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java 7 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史