gfwleak/k18-ntcs-web-argus-service
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Release-1.3' into develop

Browse Source 
# Conflicts:
#	src/main/java/com/nis/web/dao/dashboard/NtcTotalReportDao.xml
#	src/main/java/com/nis/web/dao/dashboard/TrafficUaStatisticDao.xml
This commit is contained in:
doufenghu
2018-11-16 09:50:55 +08:00
parent 996a780c3c 2084bcb305
commit 4e0629d7ae
9 changed files with 91 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
pom.xml
View File

@@ -33,6 +33,41 @@
<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> -->