Signed-off-by: janyxh <janyxh119@163.com>
Merge branch 'master' of github.com:ritacc/ItMonitor

Conflicts:
	BCM/PerfMonitor/PerfNetDetail.aspx
	DAL/PerfMonitor/PerfNetDA.cs
	DAL/SerMonitor/DeviceDA.cs

Signed-off-by: janyxh <janyxh119@163.com>