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>
Signed-off-by: Zejun Lei <847724816@qq.com>
Signed-off-by: Jingye Wang <4893278@qq.com>
Merge branch 'master' into Jingye.Wang

Conflicts:
	data/yincart-basic.mwb
sku.js
Signed-off-by: Lujie Zhou <lujie.zhou@jago-ag.cn>
index
Signed-off-by: Lujie Zhou <lujie.zhou@jago-ag.cn>
Signed-off-by: Jingye Wang <4893278@qq.com>
Merge branch 'lujie' into Jingye.Wang
index
Signed-off-by: Lujie Zhou <lujie.zhou@jago-ag.cn>
Signed-off-by: Jingye Wang <4893278@qq.com>
Signed-off-by: wucangzhou <wucangzhou@gmail.com>
Merge branch 'lujie' into cangZhou
Signed-off-by: Zejun Lei <847724816@qq.com>
Merge branch 'lujie' into julian520

Conflicts:
	protected/components/Controller.php
	protected/config/main.php

Signed-off-by: Zejun Lei <847724816@qq.com>
Signed-off-by: Lujie Zhou <lujie.zhou@jago-ag.cn>
Merge branch 'lujie' into julian520
Merge branch 'lujie' into cangZhou
Signed-off-by: Jingye Wang <4893278@qq.com>