Merge remote-tracking branch 'remotes/origin/dev_more_appid' into dev

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java

@@ -29,7 +29,6 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.SmsTemplateConstant;
-import com.epmet.constant.UserConstant;
 import com.epmet.constant.UserRoleConstant;
 import com.epmet.dao.UserCustomerDao;
 import com.epmet.dao.UserResiInfoDao;
@@ -258,12 +257,12 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 			saveUserResiInfo(userResiInfoDTO);
 			//居民注册关系表新增数据 首次注册数加一 注册数加一 参与数加一
 			registerRelationService.saveRegisterRelation(userResiInfoDTO);
-			//将用户于居民角色关联
+		/*	//将用户于居民角色关联  saveUserResiInfo已包含
 			UserRoleDTO userRole = new UserRoleDTO();
 			userRole.setUserId(userResiInfoDTO.getUserId());
 			userRole.setRoleKey(UserConstant.ROLE_RESI);
 			userRole.setApp(userResiInfoDTO.getApp());
-			userRoleService.saveUserRole(userRole);
+			userRoleService.saveUserRole(userRole);*/
 			//更新该用户在该客户下的注册状态
 			userCustomerDao.updateRegistered(userResiInfoDTO.getCustomerId(), userResiInfoDTO.getUserId());
 		}