Merge branch 'feature/dev_sunjiatan'

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserResiInfoDTO.java

@@ -142,5 +142,7 @@ public class UserResiInfoDTO implements Serializable {
 	 */
 	private String mobileCode;
 
+	private String nickname;
+
 
 }

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

@@ -129,6 +129,7 @@ public class MyHomeServiceImpl implements MyHomeService {
             userResiInfoDao.update(userResiInfo, wrapper);
 
             UserBaseInfoEntity userBaseInfoEntity = ConvertUtils.sourceToTarget(userResiInfo, UserBaseInfoEntity.class);
+            userBaseInfoEntity.setNickname(formDTO.getNickname());
             userBaseInfoService.insertOrUpdate(userBaseInfoEntity);
         } else {
             //visit表添加数据