Merge remote-tracking branch 'origin/master'

nbjk-admin/pom.xml

@@ -96,6 +96,9 @@
                 <configuration>
                     <failOnMissingWebXml>false</failOnMissingWebXml>
                     <warName>${project.artifactId}</warName>
+                    <packagingExcludes>
+                        WEB-INF/classes/geolite/GeoLite2-City.mmdb
+                    </packagingExcludes>
                 </configuration>
            </plugin>
             <plugin>