xinyin025/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-10-14 14:03:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into satoken

Browse Source 
# Conflicts:
#	ruoyi-common/pom.xml
This commit is contained in:
疯狂的狮子li
2021-10-28 10:56:21 +08:00
parent d1037c6c9a 3353ead5d3
commit f5f16aac96
5 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-common/pom.xml
View File

@@ -86,6 +86,12 @@
<!-- <artifactId>jjwt</artifactId>-->
<!-- </dependency>-->
<!-- jdk11 缺失依赖 jaxb-->
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</dependency>
<!-- redis 缓存操作 -->
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -185,4 +191,4 @@
</dependency>
</dependencies>
</project>
</project>