Merge branch 'develop' of http://192.168.100.104:49153/Volunteer/newgaokao into develop
commit
128b2ff4d3
|
|
@ -315,6 +315,9 @@ namespace New_College.Api.Controllers.Front
|
|||
newId = firstinfo.Id;
|
||||
var endinfo = customer.FirstOrDefault(e => e.Id != firstinfo.Id);
|
||||
firstinfo.IsVIP = endinfo.IsVIP ? true : firstinfo.IsVIP;
|
||||
firstinfo.Subject = endinfo.Subject;
|
||||
firstinfo.subjectgroupName = endinfo.subjectgroupName;
|
||||
firstinfo.Subjectgroup = endinfo.Subjectgroup;
|
||||
firstinfo.OpenId = endinfo.OpenId;
|
||||
//firstinfo.UserPwd = endinfo.UserPwd;
|
||||
//firstinfo.Salt= endinfo.Salt;
|
||||
|
|
|
|||
|
|
@ -134,7 +134,8 @@ namespace New_College.Controllers
|
|||
OpenId = userinfo.aud,
|
||||
CreateTime = DateTime.UtcNow,
|
||||
IsVIP = false,
|
||||
Gender = 0
|
||||
Gender = 0,
|
||||
Subject = 1
|
||||
};
|
||||
user.Id = await _CustomerInfoServices.Add(user);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue