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: Jingye Wang <4893278@qq.com>
Merge branch 'master' into Jingye.Wang

Conflicts:
	data/yincart-basic.mwb
Fix Issue #5 项目基本的空文件夹 assets, runtime 最好建一下
Signed-off-by: Jingye Wang <4893278@qq.com>
Merge branch 'lujie' into Jingye.Wang
Signed-off-by: Jingye Wang <4893278@qq.com>
Signed-off-by: wucangzhou <wucangzhou@gmail.com>
Merge branch 'lujie' into cangZhou
Merge branch 'lujie' into cangZhou
Signed-off-by: Jingye Wang <4893278@qq.com>
Merge branch 'fanhao' into Jingye.Wang

Conflicts:
	index.php
	protected/backend/modules/auth
	protected/backend/modules/auth/AuthModule.php
	protected/backend/modules/auth/README.md
	protected/backend/modules/auth/components/AuthBehavior.php
	protected/backend/modules/auth/components/AuthController.php
	protected/backend/modules/auth/components/AuthItemDataProvider.php
	protected/backend/modules/auth/components/AuthWebUser.php
	protected/backend/modules/auth/components/CachedDbAuthManager.php
	protected/backend/modules/auth/components/ICachedAuthManager.php
	protected/backend/modules/auth/components/PermissionDataProvider.php
	protected/backend/modules/auth/controllers/AssignmentController.php
	protected/backend/modules/auth/controllers/AuthItemController.php
	protected/backend/modules/auth/controllers/OperationController.php
	protected/backend/modules/auth/controllers/RoleController.php
	protected/backend/modules/auth/controllers/TaskController.php
	protected/backend/modules/auth/filters/AuthFilter.php
	protected/backend/modules/auth/messages/zh/main.php
	protected/backend/modules/auth/models/AddAuthItemForm.php
	protected/backend/modules/auth/models/AuthItemForm.php
	protected/backend/modules/auth/views/assignment/index.php
	protected/backend/modules/auth/views/assignment/view.php
	protected/backend/modules/auth/views/authItem/create.php
	protected/backend/modules/auth/views/authItem/index.php
	protected/backend/modules/auth/views/authItem/update.php
	protected/backend/modules/auth/views/authItem/view.php
	protected/backend/modules/auth/views/layouts/main.php
	protected/backend/modules/auth/widgets/AuthAssignmentColumn.php
	protected/backend/modules/auth/widgets/AuthAssignmentItemsColumn.php
	protected/backend/modules/auth/widgets/AuthAssignmentNameColumn.php
	protected/backend/modules/auth/widgets/AuthAssignmentRevokeColumn.php
	protected/backend/modules/auth/widgets/AuthAssignmentViewColumn.php
	protected/backend/modules/auth/widgets/AuthItemColumn.php
	protected/backend/modules/auth/widgets/AuthItemDescriptionColumn.php
	protected/backend/modules/auth/widgets/AuthItemRemoveColumn.php
	protected/backend/modules/auth/widgets/AuthItemTypeColumn.php

Signed-off-by: Jingye Wang <4893278@qq.com>
Signed-off-by: Jingye Wang <4893278@qq.com>
Signed-off-by: Jingye Wang <4893278@qq.com>
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 'Julian520' into cangZhou