Signed-off-by: ShiinaMinatus <xij1111@gmail.com>
Merge branch 'master' of https://github.com/zzlmilk/yajie_weixin_crm.git
weixin 礼品列表，问卷，用户中心提示
Signed-off-by: ShiinaMinatus <xij1111@gmail.com>
Merge branch 'master' of https://github.com/zzlmilk/yajie_weixin_crm.git

Conflicts:
	wchatplatform/Config/bootstrap/defined.php
	wchatplatform/Tpl/Jiantang/Reserve/order.tpl