视频后台模块
no message
no message
database update
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
  视频后台模块
视频样式
Fixed. AdminUser page and Assignments page.
Merge branch 'bugfix/YCB-125' into develop
no message
no message
Merge branch 'develop' of http://192.168.10.23:7990/scm/yin/basic into develop
Merge pull request #219 in YIN/basic from bugfix/YCB-140 to develop

# By haoxiangchen
# Via haoxiangchen
* commit '43ed0b758f6744516361e49eefda874433cf5fb1':
  Fixed. AdminUser page and Assignments page.
YCB-94 :Fixed;
YCB-102:Fixed.
修改时间
no message
Merge branch 'bugfix/YCB-129' into develop
Merge pull request #222 in YIN/basic from feature/YCB-137 to develop

# By Hao Fan
# Via Hao Fan
* commit '09077a59aaa698d39aa67f5af9eebf6a803f33d2':
  增加导航栏完成
购物车数量