Signed-off-by: Yu Chen <710913502@qq.com>
Signed-off-by: Yu Chen <710913502@qq.com>
Signed-off-by: Yu Chen <710913502@qq.com>
Signed-off-by: Yu Chen <710913502@qq.com>
Signed-off-by: Yu Chen <710913502@qq.com>
Signed-off-by: Yu Chen <710913502@qq.com>
Signed-off-by: Yu Chen <710913502@qq.com>
Signed-off-by: Yu Chen <710913502@qq.com>
Merge branch 'master' of https://github.com/yincart/basic
Merge branch 'master' into chenyu

Conflicts:
	protected/extensions/shoppingCart/EShoppingCart.php
	themes/pidiao/views/layouts/main.php
	themes/pidiao/views/site/index.php