Merge remote-tracking branch 'origin/dev'

This commit is contained in:
heyethereum
2024-08-19 22:53:28 +08:00
3 changed files with 5 additions and 0 deletions

View File

@@ -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;

View File

@@ -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;
}

View File

@@ -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())