feat():解决冲突

src/services/NewEnergy/index.js

@@ -3,12 +3,8 @@ import chargeStationMgm from './ChargeStationMgm'
 import realtimeMonitor from './realtimeMonitor'
 import recordsInquiry from './recordsInquiry'
 import ChargeDeviceMgm from './ChargeDeviceMgm'
-<<<<<<< Updated upstream
 import EquipmentSupplier from './EquipmentSupplier'
-=======
 import dataall from './dataall'
->>>>>>> Stashed changes
-
 export default {
   ...chargingMgm,
   ...EquipmentSupplier,