ushio/video_system @ 79f527321ae9920b746e38b48c1684935a323ae5

任敬轩 79f527321a Merge branch 'master' of http://git.jieweizhineng.com/ushio/video_system into master		1 anno fa
..
Admin	f2ce79fee6 去掉注册页面	2 anni fa
Camera	b59a1f5705 摄像头统计接口修改	1 anno fa
Email	0b8a05a174 访问记录邮件发送	3 anni fa
Log	a87a201501 摄像头统计接口修改	2 anni fa
Mine	f824388f96 获取区域列表接口校验	1 anno fa
OpcData	9849880cc9 水泵数据单位矫正	1 anno fa