From 70fa33d41f5447fe9f39c7581dae5971aea96929 Mon Sep 17 00:00:00 2001
From: lisf <lisf@yisa.com>
Date: Tue, 16 Jan 2024 17:58:10 +0800
Subject: [PATCH] =?UTF-8?q?fix():=20=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/services/index.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/services/index.js b/src/services/index.js
index aeceee3..abcce60 100644
--- a/src/services/index.js
+++ b/src/services/index.js
@@ -23,11 +23,7 @@ import FinancialMgm from "./FinancialMgm";
 import DataAnalysisPrediction from "./DataAnalysisPrediction";
 import ParkingOverview from "./ParkingOverview";
 import OffPeak from "./OffPeak";
-<<<<<<< Updated upstream
 import NewEnergy from "./NewEnergy";
-=======
-import NewEnergy from "./NewEnergy"
->>>>>>> Stashed changes
 const api = {};
 export default {
   ...api,