增加员工转正并完善bug
合并冲突
Merge branch 'master' of https://github.com/luhangyu/rosten-hrm.git

Conflicts:
	grails-app/controllers/com/rosten/app/staff/StaffController.groovy