Signed-off-by: wucangzhou <wucangzhou@gmail.com>
Signed-off-by: wucangzhou <wucangzhou@gmail.com>
delete cck module
Merge pull request #7 from yincart/cangZhou

Cang zhou
delete old sql data
add mysql table case cade
bug fix
bug fix
bug fix
remove application.log
Signed-off-by: wucangzhou <wucangzhou@gmail.com>
Signed-off-by: wucangzhou <wucangzhou@gmail.com>
Signed-off-by: wucangzhou <wucangzhou@gmail.com>
Merge branch 'master' into cangZhou

Conflicts:
	protected/backend/runtime/application.log
	themes/pidiao/views/site/index.php

Signed-off-by: wucangzhou <wucangzhou@gmail.com>
fix cart profile
Signed-off-by: wucangzhou <wucangzhou@gmail.com>
Merge branch 'master' of https://github.com/yincart/basic
Signed-off-by: Chaozhang Xue <475990465@qq.com>
Signed-off-by: Chaozhang Xue <475990465@qq.com>