suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/cc_20230520_partner'

Browse Source
This commit is contained in:
zhangchenbiao
2023-07-10 16:44:00 +08:00
parent 1704cd57d4 4397c7123f
commit 8d69a538cd
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
coolstore-partner-model/src/main/java/com/cool/store/dto/enterprise/EnterpriseUserDTO.java
View File

@@ -110,7 +110,9 @@ public class EnterpriseUserDTO implements Serializable {
enterpriseUserDO.setUserId(user.getUserId()); enterpriseUserDO.setUserId(user.getUserId());
enterpriseUserDO.setName(user.getName()); enterpriseUserDO.setName(user.getName());
enterpriseUserDO.setRemark(user.getRemark()); enterpriseUserDO.setRemark(user.getRemark());
enterpriseUserDO.setMobile(user.getMobile()); if(StringUtils.isNotBlank(user.getMobile())){
enterpriseUserDO.setMobile(user.getMobile().replace("+86", ""));
}
enterpriseUserDO.setEmail(user.getEmail()); enterpriseUserDO.setEmail(user.getEmail());
enterpriseUserDO.setOrgEmail(user.getOrgEmail()); enterpriseUserDO.setOrgEmail(user.getOrgEmail());
enterpriseUserDO.setMainAdmin(user.getMainAdmin()); enterpriseUserDO.setMainAdmin(user.getMainAdmin());
@@ -157,7 +159,9 @@ public class EnterpriseUserDTO implements Serializable {
enterpriseUserDO.setUserId(user.getUserId()); enterpriseUserDO.setUserId(user.getUserId());
enterpriseUserDO.setName(user.getName()); enterpriseUserDO.setName(user.getName());
enterpriseUserDO.setRemark(user.getRemark()); enterpriseUserDO.setRemark(user.getRemark());
enterpriseUserDO.setMobile(user.getMobile()); if(StringUtils.isNotBlank(user.getMobile())){
enterpriseUserDO.setMobile(user.getMobile().replace("+86", ""));
}
enterpriseUserDO.setEmail(user.getEmail()); enterpriseUserDO.setEmail(user.getEmail());
enterpriseUserDO.setOrgEmail(user.getOrgEmail()); enterpriseUserDO.setOrgEmail(user.getOrgEmail());
enterpriseUserDO.setMainAdmin(user.getMainAdmin()); enterpriseUserDO.setMainAdmin(user.getMainAdmin());