ding dan
Merge branch 'master' of https://github.com/shanghaishule/wxluxury.git
Merge branch 'master' of https://github.com/shanghaishule/wxluxury.git

Conflicts:
	SRC/weTall/app/Tpl/home/default/order/checkOrder.html