Merge branch 'master' of http://git.ycjcjy.com/marketing/pc-admin into master

config/proxy.js

@@ -8,8 +8,8 @@
 export default {
   dev: {
     '/api/': {
-      target: 'https://xlk.njyz.tech/',
-      // target: 'http://localhost:8567/',
+      // target: 'https://xlk.njyz.tech/',
+      target: 'http://localhost:8081/',
       // target: 'https://xlj.newlandsh.com/',
       changeOrigin: true,
       pathRewrite: {