删除了一口价，只显示一个价格。
no message
Remove the association
Merge pull request #210 in YIN/basic from bugfix/YCB-视频模块 to develop

# By Eyun_dsh
# Via Eyun_dsh
* commit 'ae20ef0077a9a18d0e80f7b9bd1c041379682fd2':
  视频更新
Merge pull request #211 in YIN/basic from feature/YCB-100 to develop

# By changhai.lin
# Via changhai.lin
* commit '2085a6a3429fdc7c67b813ff9f807b02b8576753':
  Remove the association
no message
Merge branch 'develop' of http://192.168.10.23:7990/scm/yin/basic into develop

Conflicts:
	protected/backend/runtime/application.log
	protected/runtime/application.log
修改了数据库密码 尝试了对首页这个按钮的链接的错误
Merge branch 'bugfix/YCB-107' into develop

Conflicts:
	protected/runtime/application.log
no message
no message
no message
Merge branch 'develop' of http://192.168.10.23:7990/scm/yin/basic into develop
Site Navigation
Merge pull request #212 in YIN/basic from feature/YCB-131 to develop

# By changhai.lin
# Via changhai.lin
* commit 'd5d37cba955e06e62dc2bd6383974063dd9d1f56':
  Site Navigation
购物车总价修改以及数据库
Merge pull request #213 in YIN/basic from feature/YCB-134 to develop

# By changhai.lin
# Via changhai.lin
* commit '35dbad7680c33e52fa1b8307b7ae338056e7cefd':
  购物车总价修改以及数据库
no message
Merge branch 'develop' of http://192.168.10.23:7990/scm/yin/basic into develop
fixed url链接