Merge remote-tracking branch 'origin/master'

pom.xml

@@ -152,6 +152,7 @@
         </profile>
     </profiles>
     <build>
+        <finalName>${project.artifactId}</finalName>
         <resources>
             <!-- 配置文件路径  -->
             <resource>