Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

Conflicts: pom.xml ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java ruoyi-ui/vue.config.js
5 years ago · efd1fc017b
parent 96507d3709 04f5a93aa8
commit efd1fc017b
1 changed files with 1 additions and 1 deletions
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@ -109,7 +109,7 @@ module.exports = {
          config.optimization.runtimeChunk('single'),
          {
             from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件
-             to: './', //到根目录下
+             to: './' //到根目录下
          }
        }
      )