RFID尚未改
添加Hfl的东西
12
Merge remote-tracking branch 'hefangli/master1' into QueXian

Conflicts:
	Application/WorkStation.csproj
小修改
计划无法删除。修改2
修改2-添加项的曲线图
修改

1.添加数据曲线
2.登录时添加一个空白窗体。以加载DEV
Merge branch 'QueXian' of https://github.com/qicb/PatrolCheck into master1

Conflicts:
	Application/WorkStation.csproj
	Application/frmImage.cs
	Application/frmMain.Designer.cs
	Application/基础信息/frmArea.cs
ertghjk