diff --git a/business/jxstore/cms/user2.go b/business/jxstore/cms/user2.go index d6344c663..5fc23a87b 100644 --- a/business/jxstore/cms/user2.go +++ b/business/jxstore/cms/user2.go @@ -159,7 +159,8 @@ 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 | model.UserTypeStoreBoss // 先不区分商户与消息者 + //user.Type = model.UserTypeConsumer | model.UserTypeStoreBoss // 先不区分商户与消息者 + user.Type = model.UserTypeConsumer // 先不区分商户与消息者 createName := ctx.GetRealRemoteIP() authType := auth2.AuthTypeMobile if manTokenInfo != nil && mobileVerifyCode == "" { @@ -210,7 +211,7 @@ func RegisterUserWithMobile(ctx *jxcontext.Context, user *model.User, mobileVeri user.Type |= model.UserTypeOperator user.Type |= model.UserTypeRole } else if user.Mobile != nil { - user.Type |= model.UserTypeStoreBoss + //user.Type |= model.UserTypeStoreBoss } createName += "," + inAuthInfo.GetAuthID() authType = inAuthInfo.GetAuthType() diff --git a/business/partner/delivery/mtps/waybill_test.go b/business/partner/delivery/mtps/waybill_test.go index a4faccc2f..4b13a7825 100644 --- a/business/partner/delivery/mtps/waybill_test.go +++ b/business/partner/delivery/mtps/waybill_test.go @@ -37,4 +37,7 @@ func TestCancelWaybill(t *testing.T) { } func Test11(t *testing.T) { + type1 := 3 + type1 |=2 + fmt.Println(type1) } \ No newline at end of file