Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

# Conflicts: # src/views/distribution/signfor/distributionSignfor.vue # vite.config.js
2 years ago · 4b8edb39b3
1 changed files with 0 additions and 4 deletions
--- a/vite.config.js
+++ b/vite.config.js
@ -12,11 +12,7 @@ export default ({ mode, command }) => {
      port: 2888,
      proxy: {
        '/api': {
-<<<<<<< HEAD
-          target: 'http://192.168.2.11:8889',
-=======
          target: 'http://192.168.2.29:13000',
->>>>>>> 859932a264850d576194e4a85decdd2c542ee4fb
          //target: 'http://test3.javablade.com',
          changeOrigin: true,
          rewrite: path => path.replace(/^\/api/, ''),