mirror of https://github.com/elunez/eladmin
Merge branch 'source'
# Conflicts: # eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/RoleServiceImpl.javapull/411/head
commit
4f42a08867
2
pom.xml
2
pom.xml
|
@ -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 -->
|
||||||
|
|
Loading…
Reference in New Issue