完成用户信息基本功能

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

Conflicts:
	weixin_crm/publicController/userController.php
修改 消费&积分

Signed-off-by: ShiinaMinatus <xij1111@gmail.com>
Merge branch 'master' of https://github.com/zzlmilk/yajie_weixin_crm

Conflicts:
	weixin_crm/basicClasses/4Basic.super.php
Merge branch 'master' of https://github.com/zzlmilk/yajie_weixin_crm

Conflicts:
	weixin_crm/publicController/userController.php
crm 积分 消费 用户信息

Signed-off-by: ShiinaMinatus <xij1111@gmail.com>
Merge branch 'master' of https://github.com/zzlmilk/yajie_weixin_crm
提交积分修改，用户基本信息

Signed-off-by: ShiinaMinatus <xij1111@gmail.com>
Merge branch 'master' of https://github.com/zzlmilk/yajie_weixin_crm