BUG Fix.
Merge branch 'master' of https://github.com/LynkLin/hrm-client.git