Merge branch 'master' of git.yfzx.zjtys.com.cn:zjm/notes2.0

# Conflicts: # notes-attendance/src/main/java/com/zjty/tynotes/attendance/controller/AttendanceController.java

Merge branch 'master' of git.yfzx.zjtys.com.cn:zjm/notes2.0
82892c89 · gongwenjie · cba0ae7c · 82892c89
--- a/notes-union/src/main/java/com/zjty/tynotes/union/UnionApplication.java
+++ b/notes-union/src/main/java/com/zjty/tynotes/union/UnionApplication.java
@@ -48,7 +48,6 @@ public class UnionApplication {
        connector.setPort(8084);
        connector.setRedirectPort(8289);
        return connector;
    }
 }