解决request冲突

utils/network/request.js

@@ -332,13 +332,13 @@ export function requestNew(code, options = {}, start = false, clie = () => {}) {
 	//公参
 	const Common = {
 		loginSource: getItem("loginSource"),
-<<<<<<< HEAD
-		customerId: getItem("customerObj").customerId,
-		accessToken: getItem(StorageKeys.Token)
-=======
+// <<<<<<< HEAD
+// 		customerId: getItem("customerObj").customerId,
+// 		accessToken: getItem(StorageKeys.Token)
+// =======
 		accessToken: getItem(StorageKeys.Token),
 		customerId: getItem("customerObj").customerId,
->>>>>>> 2bd4fd2288160c9b41c882d376c6debd9051e296
+// >>>>>>> 2bd4fd2288160c9b41c882d376c6debd9051e296
 	}
 	console.log('Common',Common, getItem("customerObj"))
 	// options.url = envs[process.env.NODE_ENV].baseUrl+'/prod' + code