Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/multi-datasource

 Conflicts:
	pom.xml
	src/main/resources/application-local.yaml
This commit is contained in:
YunaiV
2021-04-18 14:00:51 +08:00
158 changed files with 8756 additions and 287 deletions

View File

@ -187,3 +187,4 @@ yudao:
exclude-urls: # 如下两个 url仅仅是为了演示去掉配置也没关系
- ${spring.boot.admin.context-path}/** # 不处理 Spring Boot Admin 的请求
- ${management.endpoints.web.base-path}/** # 不处理 Actuator 的请求
demo: true # 开启演示模式