Merge pull request #57 from hopesfish/dev

Dev
1.分开用户与员工登录
Merge pull request #58 from hopesfish/dev

fix 测试用例 bug
Merge pull request #48 from pengqin/dev

Dev