明星电力充电桩
parent: 304c09 | 补丁 | 提交对比
puzhibing
2024-10-28 eb767fea1c9c55b66443758666cf6e987b706ff8
refs
用户 puzhibing <393733352@qq.com>
星期一, 十月 28, 2024 18:57 +0800
提交者 puzhibing <393733352@qq.com>
星期一, 十月 28, 2024 18:57 +0800
提交eb767fea1c9c55b66443758666cf6e987b706ff8
目录 b3fb9d1134340b812f289a2998f2b960bd857982 目录 | zip | gz
parent 304c09d7446aa1e3d637c4f78e8be5a55b27fd4a 查看 | 对比
da42765ebdda8ebc7cd13041c35cf5743fa3c037 查看 | 对比 
Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingRecord.java
6个文件已修改
37 ■■■■■ 已修改文件
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingRecord.java 9 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java 12 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/ParkingOrderService.java 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java 10 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TShoppingOrderMapper.xml 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史