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
Merge branch 'develop' of http://192.168.10.23:7990/scm/yin/basic into bugfix/YCB-97-url

Conflicts:
	protected/modules/cms/models/Page.php
	protected/modules/cms/views/page/admin.php