java/mx_charging_pile.git

明星电力充电桩

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

puzhibing

2024-10-18 37ccd80e905a2c88c0709829069744f6a3a3e704

refs
用户	puzhibing <393733352@qq.com>
	星期五, 十月 18, 2024 18:22 +0800
提交者	puzhibing <393733352@qq.com>
	星期五, 十月 18, 2024 18:22 +0800
提交	37ccd80e905a2c88c0709829069744f6a3a3e704
目录	0c683bcc7bf11af1257e187d91539ec79882787c 目录 \| zip \| gz
parent	bdeb8e219b8eca2ff603db66bd84ba04f2fd20d2 查看 \| 对比

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

# Conflicts:
#	ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingGunServiceImpl.java

3个文件已修改

	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml	19 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史