# Conflicts:
#	notes-attendance/src/main/java/com/zjty/tynotes/attendance/service/impl/ApprovalInformationServiceImpl.java
#	notes-union/src/main/java/com/zjty/tynotes/union/UnionApplication.java
#	notes-union/src/main/resources/application.properties
#	notes-weekly/src/main/java/com/zjty/tynotes/weekly/subject/service/impl/UserManageServiceImpl.java