Merge remote-tracking branch 'origin/Release-1.3' into Release-1.3

This commit is contained in:
doufenghu
2018-11-07 10:12:17 +08:00
15 changed files with 144 additions and 61 deletions

36
pom.xml
View File

@@ -33,42 +33,6 @@
<build>
<resources>
<resource>
<directory>src/main/resources</directory>
<includes>
<include>**/*.properties</include>
<include>**/*.xml</include>
<include>**/*.xsd</include>
<include>**/*.yml</include>
</includes>
<filtering>true</filtering>
</resource>
<resource>
<directory>src/main/resources</directory>
<filtering>false</filtering>
<includes>
<include>**/*.mmdb</include>
<include>**/*.dat</include>
<include>**/*.sh</include>
<include>**/*.bat</include>
<include>**/*.sql</include>
</includes>
</resource>
<resource>
<directory>src/main/java</directory>
<includes>
<include>**/*.properties</include>
<include>**/*.xml</include>
</includes>
<filtering>true</filtering>
</resource>
</resources>
<plugins>
<!-- <plugin> -->
<!-- <groupId>org.mybatis.generator</groupId> -->