Merge remote-tracking branch 'origin/mark' into su

2020-02-07 13:49:20 +08:00
parent 8c602871e8 1b8d792a2c
commit 9d203c90e7
24 changed files with 205 additions and 119 deletions
--- a/business/jxstore/cms/user2.go
+++ b/business/jxstore/cms/user2.go
@@ -151,7 +151,7 @@ func init() {
 func RegisterUserWithMobile(ctx *jxcontext.Context, user *model.User, mobileVerifyCode string, inAuthInfo, manTokenInfo *auth2.AuthInfo) (outAuthInfo *auth2.AuthInfo, err error) {
 	var mobileAuth *auth2.AuthInfo
 	fakeMobile := false
-	user.Type = model.UserTypeConsumer
+	user.Type = model.UserTypeConsumer | model.UserTypeStoreBoss // 先不区分商户与消息者
 	createName := ctx.GetRealRemoteIP()
 	authType := auth2.AuthTypeMobile
 	if manTokenInfo != nil && mobileVerifyCode == "" {