lilei 8 ay önce
ebeveyn
işleme
f529ae22b6
1 değiştirilmiş dosya ile 0 ekleme ve 4 silme
  1. 0 4
      vue.config.js

+ 0 - 4
vue.config.js

@@ -209,13 +209,9 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-<<<<<<< HEAD
         target: 'http://192.168.2.100:88/qpls-md',
         // target: 'https://p.iscm.360arrow.com/qpls-md',
-=======
-        // target: 'http://192.168.2.10/qpls-md',
         target: 'https://p.iscm.360arrow.com/qpls-md',
->>>>>>> ad1940f2dbd5f4ee465606bc3def599a55b70481
         // ws: false,
         ws: true,
         changeOrigin: true,