mirror of
				https://github.com/dromara/RuoYi-Vue-Plus.git
				synced 2025-11-04 16:23:42 +08:00 
			
		
		
		
	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
This commit is contained in:
		@@ -109,7 +109,7 @@ module.exports = {
 | 
			
		||||
          config.optimization.runtimeChunk('single'),
 | 
			
		||||
          {
 | 
			
		||||
             from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件
 | 
			
		||||
             to: './', //到根目录下
 | 
			
		||||
             to: './' //到根目录下
 | 
			
		||||
          }
 | 
			
		||||
        }
 | 
			
		||||
      )
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user