Merge remote-tracking branch 'origin/cc_20230520_partner'
This commit is contained in:
@@ -110,7 +110,9 @@ public class EnterpriseUserDTO implements Serializable {
|
||||
enterpriseUserDO.setUserId(user.getUserId());
|
||||
enterpriseUserDO.setName(user.getName());
|
||||
enterpriseUserDO.setRemark(user.getRemark());
|
||||
enterpriseUserDO.setMobile(user.getMobile());
|
||||
if(StringUtils.isNotBlank(user.getMobile())){
|
||||
enterpriseUserDO.setMobile(user.getMobile().replace("+86", ""));
|
||||
}
|
||||
enterpriseUserDO.setEmail(user.getEmail());
|
||||
enterpriseUserDO.setOrgEmail(user.getOrgEmail());
|
||||
enterpriseUserDO.setMainAdmin(user.getMainAdmin());
|
||||
@@ -157,7 +159,9 @@ public class EnterpriseUserDTO implements Serializable {
|
||||
enterpriseUserDO.setUserId(user.getUserId());
|
||||
enterpriseUserDO.setName(user.getName());
|
||||
enterpriseUserDO.setRemark(user.getRemark());
|
||||
enterpriseUserDO.setMobile(user.getMobile());
|
||||
if(StringUtils.isNotBlank(user.getMobile())){
|
||||
enterpriseUserDO.setMobile(user.getMobile().replace("+86", ""));
|
||||
}
|
||||
enterpriseUserDO.setEmail(user.getEmail());
|
||||
enterpriseUserDO.setOrgEmail(user.getOrgEmail());
|
||||
enterpriseUserDO.setMainAdmin(user.getMainAdmin());
|
||||
|
||||
Reference in New Issue
Block a user