Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

jhjang

2021-12-08 7b4b71ee33c7a42383d3e6a69885d521fd7b6688

 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;
@@ -162,6 +165,14 @@
        this.lastProjectId = lastProjectId;
    }

    public Long getLastIssueTypeId() {
        return lastIssueTypeId;
    }

    public void setLastIssueTypeId(Long lastIssueTypeId) {
        this.lastIssueTypeId = lastIssueTypeId;
    }

    public String getAwsKey() {
        return awsKey;
    }