Signed-off-by: ShiinaMinatus <xij1111@gmail.com>
修改错误提示
Signed-off-by: ShiinaMinatus <xij1111@gmail.com>
Merge branch 'master' of https://github.com/zzlmilk/yajie_weixin_crm.git

Conflicts:
	wchatplatform/Controllers/Company/userController.class.php
注册界面 正则验证
Signed-off-by: ShiinaMinatus <xij1111@gmail.com>
提交 兑换&优惠信息界面
Signed-off-by: ShiinaMinatus <xij1111@gmail.com>