From 6a72a3edec87cca9996c7ab3be3fd48479881945 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 02 12월 2021 21:55:28 +0900
Subject: [PATCH] 충돌 수정
---
src/main/java/kr/wisestone/owl/vo/UserVo.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/vo/UserVo.java b/src/main/java/kr/wisestone/owl/vo/UserVo.java
index eb0fea6..574694e 100644
--- a/src/main/java/kr/wisestone/owl/vo/UserVo.java
+++ b/src/main/java/kr/wisestone/owl/vo/UserVo.java
@@ -20,6 +20,8 @@
private String socialType;
private Long lastWorkspaceId;
private Long lastProjectId;
+ private Long lastIssueTypeId;
+ private Long departmentId;
private Boolean userSocialLogin = Boolean.FALSE;
private List<ProjectVo> projectVos = Lists.newArrayList();
private String reservationNotifyTime;
@@ -47,6 +49,13 @@
this.phone = phone;
}
+ public Long getDepartmentId() {
+ return departmentId;
+ }
+
+ public void setDepartmentId(Long departmentId) {
+ this.departmentId = departmentId;
+ }
public Long getId() {
return id;
}
@@ -183,6 +192,14 @@
this.sessionActiveTime = sessionActiveTime;
}
+ public Long getLastIssueTypeId() {
+ return lastIssueTypeId;
+ }
+
+ public void setLastIssueTypeId(Long lastIssueTypeId) {
+ this.lastIssueTypeId = lastIssueTypeId;
+ }
+
public Long getLastProjectId() {
return lastProjectId;
}
--
Gitblit v1.8.0