Merge branch 'source'

# Conflicts:
#	eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/RoleServiceImpl.java
pull/411/head
liaojinlong 2020-06-16 10:57:28 +08:00
commit 4f42a08867
1 changed files with 1 additions and 1 deletions

View File

@ -165,7 +165,7 @@
<dependency> <dependency>
<groupId>xerces</groupId> <groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId> <artifactId>xercesImpl</artifactId>
<version>2.11.0</version> <version>2.12.0</version>
</dependency> </dependency>
<!-- fastjson --> <!-- fastjson -->