add category menu, property, property select
Signed-off-by: Lujie Zhou <lujie.zhou@jago-ag.cn>
debug
Signed-off-by: Lujie Zhou <lujie.zhou@jago-ag.cn>
Merge branch 'lujie'

Conflicts:
	.idea/basic.iml
	README.md

Signed-off-by: Lujie Zhou <lujie.zhou@jago-ag.cn>
update db schema
Signed-off-by: Lujie Zhou <lujie.zhou@jago-ag.cn>
change db
Signed-off-by: Lujie Zhou <lujie.zhou@jago-ag.cn>
Signed-off-by: wucangzhou <443870279@qq.com>
add elfinder and fix bug
Signed-off-by: Lujie Zhou <lujie.zhou@jago-ag.cn>
Signed-off-by: Lujie Zhou <lujie.zhou@jago-ag.cn>
fix category and itemprop, fixing sku and kindeditor
Signed-off-by: Lujie Zhou <lujie.zhou@jago-ag.cn>
add ckeditor

Signed-off-by: Lujie Zhou <lujie.zhou@jago-ag.cn>
Merge branch 'cangZhou'

Conflicts:
	protected/backend/runtime/application.log
Merge branch 'lujie'

Conflicts:
	protected/backend/runtime/application.log
	protected/runtime/gii-1.1.15-dev/ModelCode.php
	protected/views/catalog/index.php
	protected/views/item/view.php
	protected/widgets/default/views/itemHistory.php
Merge branch 'master' of https://github.com/yincart/basic

Conflicts:
	protected/modules/mall/views/itemCategory/_form.php
	protected/views/catalog/index.php