Merge branch 'master' of https://git.oschina.net/egzosn/pay-java-parent into develop-Actinia

# Conflicts:
#	pom.xml
This commit is contained in:
Fuzx
2018-01-25 09:36:58 +08:00
10 changed files with 174 additions and 13 deletions

View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>pay-java-parent</artifactId>
<groupId>com.egzosn</groupId>
<version>2.0.7-SNAPSHOT</version>
<version>2.0.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>war</packaging>