提交信息
Merge remote-tracking branch 'qicb/QueXian' into master1

Conflicts:
	Application/frmEmployeeEditDelete.Designer.cs
	Application/frmEmployeeEditDelete.cs
	Application/frmItem.cs
	Application/frmPoint.cs
提交图形化文件
提交信息
提交更改的信息
提交修改的Initial Catalog=PatrolCheck2;内容
Merge remote-tracking branch 'qicb/QueXian' into master1

Conflicts:
	Application/WorkStation.csproj
	Application/frmCardEditDelete.Designer.cs
提交合并后卡片管理的内容
Revert "提交合并后卡片管理的内容"

This reverts commit 18b113b43cad034a750ba6a2764800908eb311dc.
Revert "Revert "提交合并后卡片管理的内容""

This reverts commit 602efa9ccaaffdc18d972b6104a23bc044303f40.
添加Hfl的东西
Revert "Revert "Revert "提交合并后卡片管理的内容"""

This reverts commit 38883f28686ddbbd4b1cd7f2fe48e2837ebd703e.
12
Merge remote-tracking branch 'hefangli/master1' into QueXian

Conflicts:
	Application/WorkStation.csproj
小修改
计划无法删除。修改2