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

疯狂的狮子li

2021-06-28 efd1fc017b6fa5edd71d5f787e1b75b19b2c5f1d

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

 ruoyi-ui/vue.config.js

@@ -109,7 +109,7 @@
          config.optimization.runtimeChunk('single'),
          {
             from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件
             to: './', //到根目录下
             to: './' //到根目录下
          }
        }
      )