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

 Conflicts:
	yudao-dependencies/pom.xml
	yudao-framework/pom.xml
This commit is contained in:
YunaiV
2021-10-30 10:24:58 +08:00
243 changed files with 8264 additions and 468 deletions

View File

@@ -129,11 +129,11 @@
<artifactId>screw-core</artifactId> <!-- 实现数据库文档 -->
</dependency>
<!-- TODO 后续看情况,进行调整 -->
<!-- 三方云服务相关 -->
<dependency>
<groupId>com.xkcoding.justauth</groupId>
<artifactId>justauth-spring-boot-starter</artifactId>
<version>1.4.0</version>
</dependency>
</dependencies>