合并分支 'gwj' 到 'master'

notes-union/pom.xml

@@ -140,26 +140,6 @@
                 </configuration>
             </plugin>
 
-            <!--<plugin>-->
-                <!--<groupId>org.apache.maven.plugins</groupId>-->
-                <!--<artifactId>maven-jar-plugin</artifactId>-->
-                <!--<version>3.1.0</version>-->
-                <!--<configuration>-->
-                    <!--<webResources>-->
-                        <!--&lt;!&ndash;配置第三方jar包打包的路径&ndash;&gt;-->
-                        <!--<resource>-->
-                            <!--<directory>src/main/resources/lib/</directory>-->
-                            <!--<targetPath>WEB-INF/lib/</targetPath>-->
-                            <!--<includes>-->
-                                <!--<include>**/*.jar</include>-->
-                            <!--</includes>-->
-                        <!--</resource>-->
-                    <!--</webResources>-->
-                    <!--&lt;!&ndash; maven打包的时候告诉maven不需要web.xml,否刚会报找不到web.xml错误 &ndash;&gt;-->
-                    <!--<failOnMissingWebXml>false</failOnMissingWebXml>-->
-                <!--</configuration>-->
-            <!--</plugin>-->
-
         </plugins>
 
     </build>

notes-union/src/main/java/com/zjty/tynotes/union/UnionApplication.java

 package com.zjty.tynotes.union;
 
 import com.zjty.tynotes.attendance.dao.AttendanceDetailsDao;
-import javafx.application.Application;
 import org.apache.catalina.connector.Connector;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;