合并代码

测试
提交
test
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	code/HRM/src/cn/fuego/hrm/service/ShiftService.java
	code/HRM/src/cn/fuego/hrm/service/impl/ShiftServiceImpl.java
	code/HRM/src/cn/fuego/hrm/web/action/ShiftAction.java