冲突解决

utils/utils.ts

@@ -523,10 +523,7 @@ export const uploadFile = (tempImagePath, imageType) => {
 	console.log("tempImagePath", tempImagePath, tempImagePath.size,imageType)
 	return new Promise((resolve, reject) => {
 		uni.uploadFile({
-<<<<<<< HEAD
 			// url: 'https://qtzl.etcjz.cn/newDev/minIo/upload', //测试
-=======
->>>>>>> 587f09a9f6387e5dadbd0e4541576a45b55e9f37
 			url: 'https://qtzl.etcjz.cn/newProd/minIo/upload', //仅为示例，非真实的接口地址
 			filePath: tempImagePath,
 			name: 'file',