From f919af96e5e083ad462a5e71c00ff148ebdb91c6 Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 목, 20 1월 2022 15:23:28 +0900 Subject: [PATCH] - 오토 컴플릿 항목 선택하면 목록 사라지게 수정 - 업체 메일 발송 시 템플릿 선택 문구 변경 - 연락처 입력 폼 정규식 제거하고 숫자만 입력 가능하게 수정 - 모든 사용자 필드(날짜) 24시간 타입으로 변경 --- src/main/java/kr/wisestone/owl/domain/UserDepartment.java | 21 ++++++++------------- 1 files changed, 8 insertions(+), 13 deletions(-) diff --git a/src/main/java/kr/wisestone/owl/domain/UserDepartment.java b/src/main/java/kr/wisestone/owl/domain/UserDepartment.java index c159c18..a309995 100644 --- a/src/main/java/kr/wisestone/owl/domain/UserDepartment.java +++ b/src/main/java/kr/wisestone/owl/domain/UserDepartment.java @@ -10,13 +10,8 @@ @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - private String departmentId; - - @ManyToOne(targetEntity = User.class, fetch = FetchType.LAZY) - @JoinColumn(name="user_id") - private User user; - - public UserDepartment(){} + private Long departmentId; + private Long userId; public Long getId() { return id; @@ -26,19 +21,19 @@ this.id = id; } - public String getDepartmentId() { + public Long getDepartmentId() { return departmentId; } - public void setDepartmentId(String departmentId) { + public void setDepartmentId(Long departmentId) { this.departmentId = departmentId; } - public User getUser() { - return user; + public Long getUserId() { + return userId; } - public void setUser(User user) { - this.user = user; + public void setUserId(Long userId) { + this.userId = userId; } } -- Gitblit v1.8.0