明星电力充电桩
parent: a878aa | 补丁 | 提交对比
Pu Zhibing
3 天以前 dca440a3ffc59710656931de97f797c4e13c5f3f
refs
用户 Pu Zhibing <393733352@qq.com>
星期三, 七月 9, 2025 19:41 +0800
提交者 Pu Zhibing <393733352@qq.com>
星期三, 七月 9, 2025 19:41 +0800
提交dca440a3ffc59710656931de97f797c4e13c5f3f
目录 bbd8738cb8b164eef5263b67be867ce61bdc30a8 目录 | zip | gz
parent a878aac2cc6d82a870056d8fd2bf7584fa4659ca 查看 | 对比
dfc4a0dddf37569a22ff7da57ff3d6ec7ede4410 查看 | 对比 
Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile

 Conflicts:
	ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/governmentCloud/UploadDataTaskUtil.java
	ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
	ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/util/KsolarUtils.java
7个文件已修改
195 ■■■■■ 已修改文件
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/governmentCloud/UploadDataTaskUtil.java 7 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java 64 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TScreenContentServiceImpl.java 10 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/util/EnergyRefreshService.java 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/util/KsolarUtils.java 104 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/ali/v2/H5PayUtil.java 3 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/H5AliPayController.java 5 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史