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

Conflicts:
	protected/backend/runtime/application.log

Signed-off-by: Jingye Wang <4893278@qq.com>
Signed-off-by: Jingye Wang <4893278@qq.com>
Merge branch 'lujie' into jingye

Conflicts:
	protected/controllers/OrderController.php
Signed-off-by: Jingye Wang <4893278@qq.com>
Signed-off-by: Jingye Wang <4893278@qq.com>
Signed-off-by: wucangzhou <wucangzhou@gmail.com>
Merge branch 'cangZhou' into lujie

Conflicts:
	themes/pidiao/views/layouts/main.php
Signed-off-by: Jingye Wang <4893278@qq.com>
Merge branch 'master' into julian520

Conflicts:
	protected/modules/user/messages/zh_cn/user.php
	themes/pidiao/views/user/registration.php

Signed-off-by: Zejun Lei <847724816@qq.com>
Merge branch 'julian520' into lujie
Merge branch 'jingye' into lujie