Merge remote-tracking branch 'ruoyi-vue/master' into dev

疯狂的狮子li

2021-12-20 673b225da2cae462b98c180a76b50e369e23a964

Merge remote-tracking branch 'ruoyi-vue/master' into dev

# Conflicts:
#	ruoyi-ui/vue.config.js

 ruoyi-ui/vue.config.js

@@ -59,11 +59,11 @@
      }
    },
    plugins: [
      // http://doc.ruoyi.vip/ruoyi-vue/other/faq.html#使用gzip解压缩静态文件
      new CompressionPlugin({
        test: /\.(js|css|html)?$/i,     // 压缩文件格式
        filename: '[path].gz[query]',   // 压缩后的文件名
        algorithm: 'gzip',              // 使用gzip压缩
        threshold: 10240,               // 对超过10K的数据压缩
        minRatio: 0.8                   // 压缩率小于1才会压缩
      })
    ],