视频后台模块
no message
Merge branch 'develop' of http://192.168.10.23:7990/scm/yin/basic into bugfix/YCB-视频模块

Conflicts:
	protected/controllers/videoController.php
Merge pull request #218 in YIN/basic from bugfix/YCB-视频模块 to develop

# By Eyun_dsh
# Via Eyun_dsh
* commit '65753b008069a6ee219fab92990a222f7f95b09f':
  no message
  视频后台模块