uodate
update
Merge branch 'master' of github.com:dingxiangchun/fxhrms

Conflicts:
	Bin/DAL.dll
	Bin/DAL.pdb
	DAL/DAL.suo
	DAL/obj/Debug/DAL.csprojResolveAssemblyReference.cache
	DAL/obj/Debug/DAL.dll
	DAL/obj/Debug/DAL.pdb
	HRMS.suo