Merge remote-tracking branch 'origin/dev'
This commit is contained in:
@@ -12,6 +12,7 @@ public class UserResponseDto {
|
||||
private String id;
|
||||
private String name;
|
||||
private String email;
|
||||
private String source;
|
||||
private OffsetDateTime dateJoined;
|
||||
private OffsetDateTime dateUpdated;
|
||||
private List<String> roles;
|
||||
|
||||
@@ -35,6 +35,9 @@ public class UserEntity {
|
||||
private List<String> roles;
|
||||
private String status;
|
||||
|
||||
@Column(name = "source")
|
||||
private String source;
|
||||
|
||||
@Column(name = "gmail_history_id")
|
||||
private BigInteger gmailHistoryId = BigInteger.ZERO;
|
||||
}
|
||||
|
||||
@@ -48,6 +48,7 @@ public class UserService {
|
||||
.id(userEntity.getId())
|
||||
.email(userEntity.getEmail())
|
||||
.name(userEntity.getName())
|
||||
.source(userEntity.getSource())
|
||||
.dateJoined(userEntity.getDateCreated())
|
||||
.dateUpdated(userEntity.getDateUpdated())
|
||||
.roles(userEntity.getRoles())
|
||||
|
||||
Reference in New Issue
Block a user