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
Signed-off-by: Lujie Zhou <lujie.zhou@jago-ag.cn>
Merge branch 'master' of https://github.com/yincart/basic

Conflicts:
	protected/modules/mall/views/itemCategory/_form.php
	protected/views/catalog/index.php
Merge branch 'lujie'
add messages
Merge branch 'master' of https://github.com/yincart/basic

Conflicts:
	protected/messages/bg/zii.php
	protected/messages/ca/zii.php
	protected/messages/cs/zii.php
	protected/messages/de/zii.php
	protected/messages/el/zii.php
	protected/messages/es/zii.php
	protected/messages/fi/msg.php
	protected/messages/fi/zii.php
	protected/messages/fr/zii.php
	protected/messages/he/zii.php
	protected/messages/hu/zii.php
	protected/messages/id/zii.php
	protected/messages/it/zii.php
	protected/messages/ja/zii.php
	protected/messages/kk/zii.php
	protected/messages/ko_kr/zii.php
	protected/messages/lv/zii.php
	protected/messages/nl/zii.php
	protected/messages/pl/zii.php
	protected/messages/pt/zii.php
	protected/messages/pt_br/zii.php
	protected/messages/ro/zii.php
	protected/messages/ru/zii.php
	protected/messages/sk/zii.php
	protected/messages/sv/zii.php
	protected/messages/uk/zii.php
	protected/messages/vi/zii.php
	protected/messages/zh_cn/zii.php
	protected/messages/zh_tw/zii.php
Signed-off-by: Jingye Wang <4893278@qq.com>
Signed-off-by: Jingye Wang <4893278@qq.com>
Merge branch 'master' into Jingye.Wang

Conflicts:
	protected/backend/runtime/application.log
	protected/config/main-local.php
	protected/models/Category.php
	protected/modules/mall/models/Order.php
	protected/modules/mall/views/order/_form.php
	protected/modules/mall/views/order/admin.php
	protected/views/catalog/index.php

Signed-off-by: Jingye Wang <4893278@qq.com>