Update vacation.
Merge branch 'master' of https://github.com/LynkLin/hrm-server.git

Conflicts:
	src/main/java/com/lynk/hrm/domain/AttendanceVacation.java
	src/main/resources/config/applicationContext.xml
	src/main/resources/sqlMaps/AttendanceVacationMapper.xml