new file:   HRMGS/Dattaset.Designer.cs
	new file:   HRMGS/Dattaset.xsc
	new file:   HRMGS/Dattaset.xsd
	new file:   HRMGS/Dattaset.xss
	new file:   HRMGS/JSZGDataSet.Designer.cs
	new file:   HRMGS/JSZGDataSet.xsc
	new file:   HRMGS/JSZGDataSet.xsd
	new file:   HRMGS/JSZGDataSet.xss
	new file:   HRMGS/Modules/Search/StatisticByDpt.aspx
	new file:   HRMGS/Modules/Search/StatisticByDpt.aspx.cs
	new file:   HRMGS/Modules/Search/StatisticByDpt.aspx.designer.cs
Merge branch 'master' of https://github.com/lionrock/JSZG_HRMGS

Conflicts:
	HRMGS/Modules/Search/StatisticByDpt.aspx
	HRMGS/Modules/Search/StatisticByDpt.aspx.cs

	modified:   HRMGS/Modules/HRFlowMg/EmployeeMove.aspx
	modified:   HRMGS/Modules/HRFlowMg/EmployeeMove.aspx.cs
	modified:   HRMGS/Modules/HRFlowMg/EmployeeMove.aspx.designer.cs
	modified:   HRMGS/Modules/Search/DptInfoSearch.aspx
	modified:   HRMGS/Modules/Search/FullScreenSearchResult.aspx
	modified:   HRMGS/Modules/Search/FullScreenSearchResult.aspx.cs
	modified:   HRMGS/Modules/Search/FullScreenSearchResult.aspx.designer.cs
	modified:   HRMGS/Modules/Search/StaffInfoSearch.aspx
	modified:   HRMGS/Modules/Search/StaffInfoSearch.aspx.cs
	modified:   HRMGS/Modules/Search/StatisticByDpt.aspx
	modified:   HRMGS/Modules/Search/StatisticByDpt.aspx.cs
	new file:   HRMGS/Modules/Search/TotalStatistic.aspx
	new file:   HRMGS/Modules/Search/TotalStatistic.aspx.cs
	new file:   HRMGS/Modules/Search/TotalStatistic.aspx.designer.cs
	modified:   HRMGS.v11.suo
	modified:   HRMGS/App_Data/aspnet-HRMGS-20140709161308.mdf
	modified:   HRMGS/App_Data/aspnet-HRMGS-20140709161308_log.ldf
	modified:   HRMGS/Modules/HRDevelopMg/DepartMaintain.aspx.cs
	modified:   HRMGS/Modules/HRDevelopMg/EmployeeMaintain.aspx.cs
	modified:   HRMGS/Modules/HRFlowMg/EmployeeAdd.aspx.cs
	modified:   HRMGS/Modules/HRFlowMg/EmployeeMove.aspx
	modified:   HRMGS/Modules/HRFlowMg/EmployeeMove.aspx.cs
	modified:   HRMGS/Modules/HRFlowMg/EmployeeMove.aspx.designer.cs
	modified:   HRMGS/Modules/HRFlowMg/EmployeeRemove.aspx
	modified:   HRMGS/Modules/HRFlowMg/EmployeeRemove.aspx.cs
	modified:   HRMGS/Modules/HRFlowMg/EmployeeRemove.aspx.designer.cs
	modified:   HRMGS/Modules/Search/StatisticByDpt.aspx.cs
	modified:   HRMGS/bin/HRMGS.dll
	modified:   HRMGS/bin/HRMGS.pdb
	modified:   HRMGS/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	modified:   HRMGS/obj/Debug/HRMGS.csproj.FileListAbsolute.txt
	modified:   HRMGS/obj/Debug/HRMGS.csprojResolveAssemblyReference.cache
	modified:   HRMGS/obj/Debug/HRMGS.dll
	modified:   HRMGS/obj/Debug/HRMGS.pdb