巡检点和巡检项的修改
主界面的修改。使用xPanderPanel 和DockPannel。修改刚刚进行。何芳丽同学要合并
界面
主界面
巡检项修改继承
巡检点项，修改好
巡检项 修改成功。下一步。界面开始
修正合并残留问题，并清除垃圾文件
界面功能之初步完成
Merge remote-tracking branch 'qicb/JieMian2' into DockingForm

Conflicts:
	Application/Code/SqlHelper.cs
	Application/Properties/licenses.licx
	Application/WorkStation.csproj
	Application/frmItem.cs
	Application/frmMain.Designer.cs
	Application/frmPlanExamine.Designer.cs
	Application/frmPlanToTask.Designer.cs
	Application/frmPoint.cs
	Application/frmReportAnalysisByEmployee.Designer.cs
	Application/frmReportAnalysisByEmployee.cs
	Application/frmReportAnalysisByEmployee.resx
	Application/frmRoute.Designer.cs
	Application/frmRoute.cs
	Application/frmRouteNew.cs
Merge remote-tracking branch 'qicb/JieMian2' into DockingForm

Conflicts:
	Application/Code/SqlHelper.cs
	Application/Properties/licenses.licx
	Application/WorkStation.csproj
	Application/frmItem.cs
	Application/frmMain.Designer.cs
	Application/frmPlanExamine.Designer.cs
	Application/frmPlanToTask.Designer.cs
	Application/frmPoint.cs
	Application/frmReportAnalysisByEmployee.Designer.cs
	Application/frmReportAnalysisByEmployee.cs
	Application/frmReportAnalysisByEmployee.resx
	Application/frmRoute.Designer.cs
	Application/frmRoute.cs
	Application/frmRouteNew.cs
卡片人员岗位等继承DockContent
Merge remote-tracking branch 'qicb/JieMian2' into DockingForm

Conflicts:
	Application/Code/SqlHelper.cs
	Application/frmCardEditDelete.cs
	Application/frmCardNew.cs
	Application/frmCompany.cs
	Application/frmEmployeeEditDelete.cs
	Application/frmEmployeeNew.cs
	Application/frmMain.Designer.cs
	Application/frmPlanToTask.Designer.cs
	Application/frmPostEditDelete.cs
	Application/frmPostNew.cs
	Application/frmSiteEditDelete.cs
	Application/frmSiteNew.cs
Merge remote-tracking branch 'qicb/JieMian2' into DockingForm

Conflicts:
	Application/Code/SqlHelper.cs
	Application/frmCardEditDelete.cs
	Application/frmCardNew.cs
	Application/frmCompany.cs
	Application/frmEmployeeEditDelete.cs
	Application/frmEmployeeNew.cs
	Application/frmMain.Designer.cs
	Application/frmPlanToTask.Designer.cs
	Application/frmPostEditDelete.cs
	Application/frmPostNew.cs
	Application/frmSiteEditDelete.cs
	Application/frmSiteNew.cs
提交刚刚修改过的内容
Merge remote-tracking branch 'hefangli/master1' into DockingForm

Conflicts:
	Application/Code/SqlHelper.cs
	Application/WorkStation.csproj
	Application/frmEmployeeEditDelete.cs
	Application/frmEmployeeNew.cs
	Application/frmMain.Designer.cs
	Application/frmReportAnalysisByEmployee.Designer.cs
	Application/frmReportAnalysisByEmployee.cs
	Application/frmReportAnalysisByPlan.Designer.cs
Merge remote-tracking branch 'hefangli/master1' into DockingForm

Conflicts:
	Application/Code/SqlHelper.cs
	Application/WorkStation.csproj
	Application/frmEmployeeEditDelete.cs
	Application/frmEmployeeNew.cs
	Application/frmMain.Designer.cs
	Application/frmReportAnalysisByEmployee.Designer.cs
	Application/frmReportAnalysisByEmployee.cs
	Application/frmReportAnalysisByPlan.Designer.cs
提交内容
Merge remote-tracking branch 'weiyb/Alpha' into master1
Merge remote-tracking branch 'hefangli/master1' into DockingForm

Conflicts:
	Application/Code/SqlHelper.cs
	Application/WorkStation.csproj
	Application/frmEmployeeEditDelete.cs
	Application/frmEmployeeNew.cs
	Application/frmMain.Designer.cs
	Application/frmReportAnalysisByEmployee.Designer.cs
	Application/frmReportAnalysisByEmployee.cs
	Application/frmReportAnalysisByPlan.Designer.cs