java/mx_charging_pile.git

明星电力充电桩

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charg...

puzhibing

2024-09-12 3d357cce580997b5c4c293000d26c2823207eaea

refs
用户	puzhibing <393733352@qq.com>
	星期四, 九月 12, 2024 11:09 +0800
提交者	puzhibing <393733352@qq.com>
	星期四, 九月 12, 2024 11:09 +0800
提交	3d357cce580997b5c4c293000d26c2823207eaea
目录	8536491302f2ee2d8f5e15ae58593334b6d41c5f 目录 \| zip \| gz
parent	a125c48998dac6690e85d32a29821aecad26fede 查看 \| 对比

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

2个文件已修改

	ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OtherClient.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/BasePage.java	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史