From 43a910170d8049ef99ba38cc2a81b99cad89fb0d Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 수, 10 11월 2021 15:59:17 +0900
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/kr/wisestone/owl/domain/User.java | 16 +++-------------
1 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/domain/User.java b/src/main/java/kr/wisestone/owl/domain/User.java
index 326836d..679b680 100644
--- a/src/main/java/kr/wisestone/owl/domain/User.java
+++ b/src/main/java/kr/wisestone/owl/domain/User.java
@@ -29,7 +29,6 @@
private String phone;
private String profile;
private String awsKey;
-// private Long departmentId;
@Enumerated(EnumType.STRING)
private SocialType socialType;
private Long lastWorkspaceId;
@@ -64,10 +63,9 @@
@JoinColumn(name="level_id")
private UserLevel userLevel;
- @ManyToOne(targetEntity = DepartmentManage.class, fetch = FetchType.LAZY)
- @JoinColumn(name="department_id")
- private DepartmentManage departmentManage;
-
+// @ManyToOne(targetEntity = Department.class, fetch = FetchType.LAZY)
+// @JoinColumn(name="department_id")
+// private Department department;
public User() {
}
@@ -76,14 +74,6 @@
this.id = id;
this.name = name;
this.account = account;
- }
-
- public DepartmentManage getDepartmentManage() {
- return departmentManage;
- }
-
- public void setDepartmentManage(DepartmentManage departmentManage) {
- this.departmentManage = departmentManage;
}
public UserLevel getUserLevel() {
--
Gitblit v1.8.0