ushio/video_system @ 2418dff21059dc455fc58ae3355ff1232db27828

q 2418dff210 Merge remote-tracking branch 'origin/master'		1 gadu atpakaļ
..
Admin	e604fa904c 视频播放逻辑	1 gadu atpakaļ
Camera	b59a1f5705 摄像头统计接口修改	1 gadu atpakaļ
Email	0b8a05a174 访问记录邮件发送	3 gadi atpakaļ
Log	a87a201501 摄像头统计接口修改	2 gadi atpakaļ
Mine	5b6b54defb 根据摄像头id获取区域名称接口	2 gadi atpakaļ
OpcData	f116e1e5df 通风电力点位校对	1 gadu atpakaļ