diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/mapper/XhpcDeviceMessageMapper.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/mapper/XhpcDeviceMessageMapper.java
similarity index 90%
rename from xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/mapper/XhpcDeviceMessageMapper.java
rename to xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/mapper/XhpcDeviceMessageMapper.java
index a0f2fb54..382e89e2 100644
--- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/mapper/XhpcDeviceMessageMapper.java
+++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/mapper/XhpcDeviceMessageMapper.java
@@ -1,4 +1,4 @@
-package com.xhpc.pp.mapper;
+package com.xhpc.mapper;
 
 
 import com.xhpc.pp.domain.XhpcDeviceMessage;
diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java
index adf450b4..cc720066 100644
--- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java
+++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java
@@ -11,7 +11,7 @@ import com.xhpc.common.data.down.StartChargingData;
 import com.xhpc.common.enums.StationDeviceEnum;
 import com.xhpc.pp.domain.XhpcDeviceMessage;
 import com.xhpc.pp.logic.RateModelRequestLogic;
-import com.xhpc.pp.mapper.XhpcDeviceMessageMapper;
+import com.xhpc.mapper.XhpcDeviceMessageMapper;
 import com.xhpc.pp.server.ChargingPileServer;
 import com.xhpc.pp.utils.HexUtils;
 import com.xhpc.pp.utils.security.CRCCalculator;
diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BalanceUpdateReplyDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BalanceUpdateReplyDataLogic.java
index ba79e1ae..d74e45fe 100644
--- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BalanceUpdateReplyDataLogic.java
+++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BalanceUpdateReplyDataLogic.java
@@ -4,7 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.xhpc.common.data.up.BalanceUpdateReplyData;
 import com.xhpc.common.enums.StationDeviceEnum;
 import com.xhpc.pp.domain.XhpcDeviceMessage;
-import com.xhpc.pp.mapper.XhpcDeviceMessageMapper;
+import com.xhpc.mapper.XhpcDeviceMessageMapper;
 import com.xhpc.pp.tx.ServiceParameter;
 import com.xhpc.pp.tx.ServiceResult;
 import com.xhpc.pp.tx.logic.ServiceLogic;
diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargerInterruptDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargerInterruptDataLogic.java
index 8b28e1f2..f91f8a46 100644
--- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargerInterruptDataLogic.java
+++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargerInterruptDataLogic.java
@@ -2,7 +2,7 @@ package com.xhpc.pp.logic;
 
 import com.xhpc.common.enums.StationDeviceEnum;
 import com.xhpc.pp.domain.XhpcDeviceMessage;
-import com.xhpc.pp.mapper.XhpcDeviceMessageMapper;
+import com.xhpc.mapper.XhpcDeviceMessageMapper;
 import com.xhpc.pp.tx.ServiceParameter;
 import com.xhpc.pp.tx.ServiceResult;
 import com.xhpc.pp.tx.logic.ServiceLogic;
diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingCompletedDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingCompletedDataLogic.java
index 215beb0c..d177fa96 100644
--- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingCompletedDataLogic.java
+++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingCompletedDataLogic.java
@@ -2,7 +2,7 @@ package com.xhpc.pp.logic;
 
 import com.xhpc.common.enums.StationDeviceEnum;
 import com.xhpc.pp.domain.XhpcDeviceMessage;
-import com.xhpc.pp.mapper.XhpcDeviceMessageMapper;
+import com.xhpc.mapper.XhpcDeviceMessageMapper;
 import com.xhpc.pp.tx.ServiceParameter;
 import com.xhpc.pp.tx.ServiceResult;
 import com.xhpc.pp.tx.logic.ServiceLogic;
diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingConfigDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingConfigDataLogic.java
index 612cd9f8..940825ac 100644
--- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingConfigDataLogic.java
+++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingConfigDataLogic.java
@@ -2,7 +2,7 @@ package com.xhpc.pp.logic;
 
 import com.xhpc.common.enums.StationDeviceEnum;
 import com.xhpc.pp.domain.XhpcDeviceMessage;
-import com.xhpc.pp.mapper.XhpcDeviceMessageMapper;
+import com.xhpc.mapper.XhpcDeviceMessageMapper;
 import com.xhpc.pp.tx.ServiceParameter;
 import com.xhpc.pp.tx.ServiceResult;
 import com.xhpc.pp.tx.logic.ServiceLogic;
diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingDataLogic.java
index 85a72517..2976e2bb 100644
--- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingDataLogic.java
+++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingDataLogic.java
@@ -2,7 +2,7 @@ package com.xhpc.pp.logic;
 
 import com.xhpc.common.enums.StationDeviceEnum;
 import com.xhpc.pp.domain.XhpcDeviceMessage;
-import com.xhpc.pp.mapper.XhpcDeviceMessageMapper;
+import com.xhpc.mapper.XhpcDeviceMessageMapper;
 import com.xhpc.pp.tx.ServiceParameter;
 import com.xhpc.pp.tx.ServiceResult;
 import com.xhpc.pp.tx.logic.ServiceLogic;
diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingHandshakeDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingHandshakeDataLogic.java
index 17f00ea6..18c70ce9 100644
--- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingHandshakeDataLogic.java
+++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingHandshakeDataLogic.java
@@ -2,7 +2,7 @@ package com.xhpc.pp.logic;
 
 import com.xhpc.common.enums.StationDeviceEnum;
 import com.xhpc.pp.domain.XhpcDeviceMessage;
-import com.xhpc.pp.mapper.XhpcDeviceMessageMapper;
+import com.xhpc.mapper.XhpcDeviceMessageMapper;
 import com.xhpc.pp.tx.ServiceParameter;
 import com.xhpc.pp.tx.ServiceResult;
 import com.xhpc.pp.tx.logic.ServiceLogic;
diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsErrorDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsErrorDataLogic.java
index 5895bad2..71b22460 100644
--- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsErrorDataLogic.java
+++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsErrorDataLogic.java
@@ -2,7 +2,7 @@ package com.xhpc.pp.logic;
 
 import com.xhpc.common.enums.StationDeviceEnum;
 import com.xhpc.pp.domain.XhpcDeviceMessage;
-import com.xhpc.pp.mapper.XhpcDeviceMessageMapper;
+import com.xhpc.mapper.XhpcDeviceMessageMapper;
 import com.xhpc.pp.tx.ServiceParameter;
 import com.xhpc.pp.tx.ServiceResult;
 import com.xhpc.pp.tx.logic.ServiceLogic;
diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsInterruptDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsInterruptDataLogic.java
index b99ac2f5..715cefd6 100644
--- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsInterruptDataLogic.java
+++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsInterruptDataLogic.java
@@ -2,7 +2,7 @@ package com.xhpc.pp.logic;
 
 import com.xhpc.common.enums.StationDeviceEnum;
 import com.xhpc.pp.domain.XhpcDeviceMessage;
-import com.xhpc.pp.mapper.XhpcDeviceMessageMapper;
+import com.xhpc.mapper.XhpcDeviceMessageMapper;
 import com.xhpc.pp.tx.ServiceParameter;
 import com.xhpc.pp.tx.ServiceResult;
 import com.xhpc.pp.tx.logic.ServiceLogic;
diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsReqChargerOutputDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsReqChargerOutputDataLogic.java
index 7e1fcbc0..f5a0e61c 100644
--- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsReqChargerOutputDataLogic.java
+++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsReqChargerOutputDataLogic.java
@@ -2,7 +2,7 @@ package com.xhpc.pp.logic;
 
 import com.xhpc.common.enums.StationDeviceEnum;
 import com.xhpc.pp.domain.XhpcDeviceMessage;
-import com.xhpc.pp.mapper.XhpcDeviceMessageMapper;
+import com.xhpc.mapper.XhpcDeviceMessageMapper;
 import com.xhpc.pp.tx.ServiceParameter;
 import com.xhpc.pp.tx.ServiceResult;
 import com.xhpc.pp.tx.logic.ServiceLogic;
diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OfflineCardEraseReplyDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OfflineCardEraseReplyDataLogic.java
index bb063596..31912978 100644
--- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OfflineCardEraseReplyDataLogic.java
+++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OfflineCardEraseReplyDataLogic.java
@@ -2,7 +2,7 @@ package com.xhpc.pp.logic;
 
 import com.xhpc.common.enums.StationDeviceEnum;
 import com.xhpc.pp.domain.XhpcDeviceMessage;
-import com.xhpc.pp.mapper.XhpcDeviceMessageMapper;
+import com.xhpc.mapper.XhpcDeviceMessageMapper;
 import com.xhpc.pp.tx.ServiceParameter;
 import com.xhpc.pp.tx.ServiceResult;
 import com.xhpc.pp.tx.logic.ServiceLogic;
diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OfflineCardInquiryReplyDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OfflineCardInquiryReplyDataLogic.java
index 35cc7aac..784ce841 100644
--- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OfflineCardInquiryReplyDataLogic.java
+++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OfflineCardInquiryReplyDataLogic.java
@@ -2,7 +2,7 @@ package com.xhpc.pp.logic;
 
 import com.xhpc.common.enums.StationDeviceEnum;
 import com.xhpc.pp.domain.XhpcDeviceMessage;
-import com.xhpc.pp.mapper.XhpcDeviceMessageMapper;
+import com.xhpc.mapper.XhpcDeviceMessageMapper;
 import com.xhpc.pp.tx.ServiceParameter;
 import com.xhpc.pp.tx.ServiceResult;
 import com.xhpc.pp.tx.logic.ServiceLogic;
diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OfflineCardSyncReplyDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OfflineCardSyncReplyDataLogic.java
index 58722743..1b7fd7da 100644
--- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OfflineCardSyncReplyDataLogic.java
+++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OfflineCardSyncReplyDataLogic.java
@@ -4,7 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.xhpc.common.data.up.OfflineCardSyncReplyData;
 import com.xhpc.common.enums.StationDeviceEnum;
 import com.xhpc.pp.domain.XhpcDeviceMessage;
-import com.xhpc.pp.mapper.XhpcDeviceMessageMapper;
+import com.xhpc.mapper.XhpcDeviceMessageMapper;
 import com.xhpc.pp.tx.ServiceParameter;
 import com.xhpc.pp.tx.ServiceResult;
 import com.xhpc.pp.tx.logic.ServiceLogic;
diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileConfigReplyDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileConfigReplyDataLogic.java
index 26ea5a1d..09a34622 100644
--- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileConfigReplyDataLogic.java
+++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileConfigReplyDataLogic.java
@@ -4,7 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.xhpc.common.data.up.PileConfigReplyData;
 import com.xhpc.common.enums.StationDeviceEnum;
 import com.xhpc.pp.domain.XhpcDeviceMessage;
-import com.xhpc.pp.mapper.XhpcDeviceMessageMapper;
+import com.xhpc.mapper.XhpcDeviceMessageMapper;
 import com.xhpc.pp.tx.ServiceParameter;
 import com.xhpc.pp.tx.ServiceResult;
 import com.xhpc.pp.tx.logic.ServiceLogic;
diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileStartChargingDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileStartChargingDataLogic.java
index d6b0b655..6ffe0846 100644
--- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileStartChargingDataLogic.java
+++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileStartChargingDataLogic.java
@@ -4,7 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.xhpc.common.data.up.PileStartChargingData;
 import com.xhpc.common.enums.StationDeviceEnum;
 import com.xhpc.pp.domain.XhpcDeviceMessage;
-import com.xhpc.pp.mapper.XhpcDeviceMessageMapper;
+import com.xhpc.mapper.XhpcDeviceMessageMapper;
 import com.xhpc.pp.tx.ServiceParameter;
 import com.xhpc.pp.tx.ServiceResult;
 import com.xhpc.pp.tx.logic.ServiceLogic;
diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileTimeConfigReplyDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileTimeConfigReplyDataLogic.java
index 8f3c89a0..b4b91e62 100644
--- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileTimeConfigReplyDataLogic.java
+++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileTimeConfigReplyDataLogic.java
@@ -5,7 +5,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.xhpc.common.data.up.PileTimeConfigReplyData;
 import com.xhpc.common.enums.StationDeviceEnum;
 import com.xhpc.pp.domain.XhpcDeviceMessage;
-import com.xhpc.pp.mapper.XhpcDeviceMessageMapper;
+import com.xhpc.mapper.XhpcDeviceMessageMapper;
 import com.xhpc.pp.tx.ServiceParameter;
 import com.xhpc.pp.tx.ServiceResult;
 import com.xhpc.pp.tx.logic.ServiceLogic;
diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelConfigReplyDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelConfigReplyDataLogic.java
index 19c0feca..5065694e 100644
--- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelConfigReplyDataLogic.java
+++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelConfigReplyDataLogic.java
@@ -5,7 +5,7 @@ import com.xhpc.common.api.dto.ChargingStationDto;
 import com.xhpc.common.data.up.PileConfigReplyData;
 import com.xhpc.common.enums.StationDeviceEnum;
 import com.xhpc.pp.domain.XhpcDeviceMessage;
-import com.xhpc.pp.mapper.XhpcDeviceMessageMapper;
+import com.xhpc.mapper.XhpcDeviceMessageMapper;
 import com.xhpc.pp.tx.ServiceParameter;
 import com.xhpc.pp.tx.ServiceResult;
 import com.xhpc.pp.tx.logic.ServiceLogic;
diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelRequestLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelRequestLogic.java
index 9502f806..97875b0d 100644
--- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelRequestLogic.java
+++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelRequestLogic.java
@@ -6,7 +6,7 @@ import com.xhpc.common.api.dto.ChargingStationDto;
 import com.xhpc.common.data.redis.CacheRateModel;
 import com.xhpc.common.enums.StationDeviceEnum;
 import com.xhpc.pp.domain.XhpcDeviceMessage;
-import com.xhpc.pp.mapper.XhpcDeviceMessageMapper;
+import com.xhpc.mapper.XhpcDeviceMessageMapper;
 import com.xhpc.pp.tx.ServiceParameter;
 import com.xhpc.pp.tx.ServiceResult;
 import com.xhpc.pp.tx.logic.ServiceLogic;
diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelValidateLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelValidateLogic.java
index b2ad2891..bcf50f03 100644
--- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelValidateLogic.java
+++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelValidateLogic.java
@@ -3,7 +3,7 @@ package com.xhpc.pp.logic;
 import com.xhpc.common.api.dto.ChargingStationDto;
 import com.xhpc.common.enums.StationDeviceEnum;
 import com.xhpc.pp.domain.XhpcDeviceMessage;
-import com.xhpc.pp.mapper.XhpcDeviceMessageMapper;
+import com.xhpc.mapper.XhpcDeviceMessageMapper;
 import com.xhpc.pp.tx.ServiceParameter;
 import com.xhpc.pp.tx.ServiceResult;
 import com.xhpc.pp.tx.logic.ServiceLogic;
diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RegisterLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RegisterLogic.java
index 417859f2..252c3af4 100644
--- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RegisterLogic.java
+++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RegisterLogic.java
@@ -3,7 +3,7 @@ package com.xhpc.pp.logic;
 import com.xhpc.common.enums.StationDeviceEnum;
 import com.xhpc.evcs.dto.ConnectorStatusInfo;
 import com.xhpc.pp.domain.XhpcDeviceMessage;
-import com.xhpc.pp.mapper.XhpcDeviceMessageMapper;
+import com.xhpc.mapper.XhpcDeviceMessageMapper;
 import com.xhpc.pp.tx.ServiceParameter;
 import com.xhpc.pp.tx.ServiceResult;
 import com.xhpc.pp.tx.logic.ServiceLogic;
diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RemoteRestartReplyDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RemoteRestartReplyDataLogic.java
index 12137040..808bc2b5 100644
--- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RemoteRestartReplyDataLogic.java
+++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RemoteRestartReplyDataLogic.java
@@ -4,7 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.xhpc.common.data.up.PileConfigReplyData;
 import com.xhpc.common.enums.StationDeviceEnum;
 import com.xhpc.pp.domain.XhpcDeviceMessage;
-import com.xhpc.pp.mapper.XhpcDeviceMessageMapper;
+import com.xhpc.mapper.XhpcDeviceMessageMapper;
 import com.xhpc.pp.tx.ServiceParameter;
 import com.xhpc.pp.tx.ServiceResult;
 import com.xhpc.pp.tx.logic.ServiceLogic;
diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RemoteUpgradeReplyDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RemoteUpgradeReplyDataLogic.java
index e28856fa..0c3c4376 100644
--- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RemoteUpgradeReplyDataLogic.java
+++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RemoteUpgradeReplyDataLogic.java
@@ -4,7 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.xhpc.common.data.up.PileConfigReplyData;
 import com.xhpc.common.enums.StationDeviceEnum;
 import com.xhpc.pp.domain.XhpcDeviceMessage;
-import com.xhpc.pp.mapper.XhpcDeviceMessageMapper;
+import com.xhpc.mapper.XhpcDeviceMessageMapper;
 import com.xhpc.pp.tx.ServiceParameter;
 import com.xhpc.pp.tx.ServiceResult;
 import com.xhpc.pp.tx.logic.ServiceLogic;
diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/ChargingPileBinaryHandler.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/ChargingPileBinaryHandler.java
index 145efa30..90479c18 100644
--- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/ChargingPileBinaryHandler.java
+++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/ChargingPileBinaryHandler.java
@@ -8,7 +8,7 @@ import com.xhpc.pp.domain.ServiceField;
 import com.xhpc.pp.domain.XhpcDeviceMessage;
 import com.xhpc.pp.logic.FieldLogic;
 import com.xhpc.pp.logic.ServiceMainLogic;
-import com.xhpc.pp.mapper.XhpcDeviceMessageMapper;
+import com.xhpc.mapper.XhpcDeviceMessageMapper;
 import com.xhpc.pp.tx.ServiceParameter;
 import com.xhpc.pp.tx.ServiceResult;
 import com.xhpc.pp.tx.TxException;
diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/HBCheckTask.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/HBCheckTask.java
index 6fc1d521..f371b1c9 100644
--- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/HBCheckTask.java
+++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/HBCheckTask.java
@@ -4,7 +4,7 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.xhpc.common.enums.StationDeviceEnum;
 import com.xhpc.pp.domain.XhpcDeviceMessage;
-import com.xhpc.pp.mapper.XhpcDeviceMessageMapper;
+import com.xhpc.mapper.XhpcDeviceMessageMapper;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
diff --git a/xhpc-modules/xhpc-power-pile/src/main/resources/mapper/XhpcDeviceMessageMapper.xml b/xhpc-modules/xhpc-power-pile/src/main/resources/mapper/XhpcDeviceMessageMapper.xml
index 656847e2..9f546975 100644
--- a/xhpc-modules/xhpc-power-pile/src/main/resources/mapper/XhpcDeviceMessageMapper.xml
+++ b/xhpc-modules/xhpc-power-pile/src/main/resources/mapper/XhpcDeviceMessageMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xhpc.pp.mapper.XhpcDeviceMessageMapper">
+<mapper namespace="com.xhpc.mapper.XhpcDeviceMessageMapper">
 
     <resultMap type="com.xhpc.pp.domain.XhpcDeviceMessage" id="XhpcDeviceMessageResult">
         <id property="deviceMessageId" column="device_message_id"/>