From d6bb6c4485ea9134caf48ef09424594e1a26b30c Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期四, 01 四月 2021 09:33:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop

---
 src/api/mapUrl.js |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/api/mapUrl.js b/src/api/mapUrl.js
index 1b986df..d956576 100644
--- a/src/api/mapUrl.js
+++ b/src/api/mapUrl.js
@@ -5,12 +5,11 @@
 
 export const GetUser = $HOST + '/user/getUser'
 
+export const getSolidWaste = $HOST + '/wasteSolid/getSolidWaste'
+export const getSolidWasteBaseInfo = $HOST + '/wasteSolid/getSolidWasteBaseInfo'
+
 export const GetWasteGas = $HOST + '/wasteGas/getWasteGas'
 
-export const getSolidWaste = $HOST + '/wasteSolid/getSolidWaste'
-
 export const getWasteWater = $HOST + '/wasteWater/getWasteWater'
-
-export const getSolidWasteBaseInfo = $HOST + '/wasteSolid/getSolidWasteBaseInfo'
 
 export const getCompany = $HOST + '/company/getCompany'

--
Gitblit v1.8.0