提交 crm  用户管理&订单管理

Signed-off-by: ShiinaMinatus <xij1111@gmail.com>
Merge remote-tracking branch 'origin/master'

Conflicts:
	wchatplatform/Controllers/Company/testController.class.php
提交crm兑换模块
Merge remote-tracking branch 'origin/master'

Conflicts:
	weixin_api/Logs/Error/error.log