初步完成Salary

修正exception bug
Merge branch 'develop' of github.com:SpringNyan/Hotel into develop