Merge remote-tracking branch 'origin/master'

odc.xiaohui

2023-05-22 0782140a00e554ec7a1c724ecc1eb36726d994f8

 vue.config.js

@@ -7,14 +7,15 @@
        open: true,
        proxy: {
            '/api': {
                // target: 'http://192.168.3.220:8080',
                target: 'https://qyqjzdd.cdqingyang.gov.cn/qyjz',
                target: 'http://192.168.3.220:8080',
                // target: 'https://qyqjzdd.cdqingyang.gov.cn/qyjz',
                changeOrigin: true,
                pathRewrite: {
                    '^/api': ''
                }
            },
            '/minio': {
                // target: 'http://192.168.3.220:8080/minio',
                target: 'https://qyqjzdd.cdqingyang.gov.cn/minio',
                changeOrigin: true,
                pathRewrite: {