From 7b4b71ee33c7a42383d3e6a69885d521fd7b6688 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 수, 08 12월 2021 17:25:23 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/domain/User.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/domain/User.java b/src/main/java/kr/wisestone/owl/domain/User.java
index f86c285..d479a6e 100644
--- a/src/main/java/kr/wisestone/owl/domain/User.java
+++ b/src/main/java/kr/wisestone/owl/domain/User.java
@@ -15,8 +15,10 @@
public static final String USER_STATUS_ACTIVE = "01"; // �궗�슜�옄 �솢�꽦
public static final String USER_STATUS_DEL = "02"; // �궗�슜�옄 �깉�눜
- public static final String DEFAULT_PROFILE = "assets/images/default_profile.png"; // 湲곕낯 �봽濡쒗븘
- public static final String DEFAULT_RESERVATION_NOTIFY_TIME = "09:00"; // 湲곕낯 �씠硫붿씪 �븣由� �삁�젙 �떆媛�
+ //public static final String DEFAULT_PROFILE = "assets/images/default_profile.png"; // 湲곕낯 �봽濡쒗븘
+ public static final String DEFAULT_PROFILE = "assets/images/default-profile-kisa.png"; // �씤�꽣�꽬吏꾪씎�썝 湲곕낯 �봽濡쒗븘
+ //public static final String DEFAULT_RESERVATION_NOTIFY_TIME = "09:00"; // 湲곕낯 �씠硫붿씪 �븣由� �삁�젙 �떆媛�
+ public static final String DEFAULT_RESERVATION_NOTIFY_TIME = "false"; // 湲곕낯 �씠硫붿씪 �븣由� �삁�젙 �떆媛� false濡� 蹂�寃�
public static final String DEFAULT_LANGUAGE = "ko"; // 湲곕낯 �뼵�뼱
public static final String INSERT_TYPE_NORMAL = "N"; // 異붽� ���엯(�씪諛�)
@@ -36,6 +38,7 @@
private SocialType socialType;
private Long lastWorkspaceId;
private Long lastProjectId;
+ private Long lastIssueTypeId;
private Date lastLoginDate;
private String reservationNotifyTime; // �씠硫붿씪 �븣由� �떆媛� �삁�젙
private String language;
@@ -69,10 +72,6 @@
@OneToMany(mappedBy = "user", cascade = {CascadeType.ALL}, orphanRemoval = true)
private Set<ApiToken> apiTokens = new HashSet<>();
-
-// @ManyToOne(targetEntity = Department.class, fetch = FetchType.LAZY)
-// @JoinColumn(name="department_id")
-// private Department department;
public User() {
}
@@ -166,6 +165,14 @@
this.lastProjectId = lastProjectId;
}
+ public Long getLastIssueTypeId() {
+ return lastIssueTypeId;
+ }
+
+ public void setLastIssueTypeId(Long lastIssueTypeId) {
+ this.lastIssueTypeId = lastIssueTypeId;
+ }
+
public String getAwsKey() {
return awsKey;
}
--
Gitblit v1.8.0