发货按钮
Merge branch 'develop' of http://192.168.10.23:7990/scm/yin/basic into develop
Fix authority problem.
增加了assets
no message
Merge pull request #206 in YIN/basic from bugfix/YCB-77-controllermodel to develop

# By haoxiangchen
# Via haoxiangchen
* commit '15b7eda733ab16658af931274e13063f9b2e5f08':
  Fix authority problem.
runtime
no message
no message
no message
no message
Merge pull request #207 in YIN/basic from feature/YCB-79-controllermodel3 to develop

# By changhai.lin
# Via changhai.lin
* commit '2a50a4f7e2378c9efb4c653aae976a7b6888dab6':
  no message
no message
新闻页面修改
Merge pull request #208 in YIN/basic from feature/YCB-106-language to develop

# By changhai.lin
# Via changhai.lin
* commit 'fb071b3cde72878d33dcc8c621382264a6655470':
  no message
Merge pull request #209 in YIN/basic from hotfix/YCB-68ddd to develop

# By Jiadong.Han
# Via Jiadong.Han
* commit '4e99a0bc56888a171196d40b1422d7b71096c8d1':
  新闻页面修改
no message
no message
视频模块
Merge branch 'develop' of http://192.168.10.23:7990/scm/yin/basic into develop