yjh_yyds 2ea195bf66 Merge remote-tracking branch 'origin/operation' into operation ...

# Conflicts:
#	evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/cdjgpc/api/CDNotificationStationInfoController.java
#	xhpc-modules/xhpc-activity/src/main/resources/bootstrap.yml
#	xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java
#	xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java
#	xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java
#	xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsReqChargerOutputDataLogic.java
#	xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/utils/security/CP56Time2a.java
#	xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcAppUserController.java

2024-08-14 09:23:21 +08:00

..

src

Merge remote-tracking branch 'origin/operation' into operation

2024-08-14 09:23:21 +08:00

pom.xml

从pom中删除重复的hutool包引入

2021-12-03 09:47:10 +08:00