ushio/video_system @ c3138081d72986111d68eb6babb9c808b9fdf4b5

任敬轩 c3138081d7 Merge branch 'master' of http://git.jieweizhineng.com/ushio/video_system into master		1 gadu atpakaļ
..
Admin	58db233e49 token验证修改	2 gadi atpakaļ
Camera	5fb5a772a4 新闻类别接口修改	1 gadu atpakaļ
Email	0b8a05a174 访问记录邮件发送	2 gadi atpakaļ
Log	a87a201501 摄像头统计接口修改	2 gadi atpakaļ
Mine	5b6b54defb 根据摄像头id获取区域名称接口	2 gadi atpakaļ
OpcData	a4c73f1b77 数据顺序调整	1 gadu atpakaļ