ushio/video_system @ d618f66f07eb812b489c57db17fa5623543a3b6e

任敬轩 d618f66f07 Merge branch 'master' of http://git.jieweizhineng.com/ushio/video_system into master		1 gadu atpakaļ
..
Admin	e604fa904c 视频播放逻辑	1 gadu atpakaļ
Camera	b59a1f5705 摄像头统计接口修改	1 gadu atpakaļ
Email	0b8a05a174 访问记录邮件发送	2 gadi atpakaļ
Log	a87a201501 摄像头统计接口修改	2 gadi atpakaļ
Mine	94902858e4 获取区域列表接口校验	1 gadu atpakaļ
OpcData	64952bd781 水泵房点位调整	1 gadu atpakaļ