提交

frontend/config/proxy.ts

@@ -6,11 +6,7 @@
 export default {
 	dev: {
 		'/api/': {
-<<<<<<< HEAD
-			target: 'http://10.2.1.26:21674/api',
-=======
 			target: 'http://localhost:5002',
->>>>>>> 5a33526b55b587caa499387f0387d70fe2e4a808
 			pathRewrite: {
 				'/api': '/api'
 			},