冲突处理

ruoyi-ui/vue.config.js

@@ -37,11 +37,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-<<<<<<< HEAD
-        target: `http://192.168.110.70:8080`,
-=======
         target: `http://192.168.110.59:8080`,
->>>>>>> 5e440f2e4037d9610244468288c398ef7dc71f92
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''