From 8b30703c3917d6f07292b184212f65bd03bb2b5a Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 금, 07 1월 2022 13:41:44 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/util/ConvertUtil.java | 4 +++-
src/main/java/kr/wisestone/owl/vo/UserVo.java | 9 +++++++++
src/main/java/kr/wisestone/owl/web/form/ApiIssueAddForm.java | 10 ++++++++++
3 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/util/ConvertUtil.java b/src/main/java/kr/wisestone/owl/util/ConvertUtil.java
index 5bc0f35..fadaa0f 100644
--- a/src/main/java/kr/wisestone/owl/util/ConvertUtil.java
+++ b/src/main/java/kr/wisestone/owl/util/ConvertUtil.java
@@ -357,7 +357,9 @@
}
}
} catch (Exception e) {
- LOGGER.error("fieldName : " + fieldName, e);
+ if (LOGGER.isWarnEnabled()) {
+ LOGGER.warn("fieldName : " + fieldName, e);
+ }
return false;
}
diff --git a/src/main/java/kr/wisestone/owl/vo/UserVo.java b/src/main/java/kr/wisestone/owl/vo/UserVo.java
index e069ad5..e631f76 100644
--- a/src/main/java/kr/wisestone/owl/vo/UserVo.java
+++ b/src/main/java/kr/wisestone/owl/vo/UserVo.java
@@ -28,6 +28,7 @@
private List<ProjectVo> projectVos = Lists.newArrayList();
private String reservationNotifyTime;
private String language;
+ private Integer permission;
private String licensekey;
private Long sessionActiveTime; // �겢�윭�뒪�꽣留� �솚寃쎌뿉�꽌 �젒�냽以묒씤 �궗�슜�옄 愿�由ъ뿉 �궗�슜
private Boolean projectManagerYN = Boolean.FALSE;
@@ -170,6 +171,14 @@
this.language = language;
}
+ public Integer getPermission() {
+ return permission;
+ }
+
+ public void setPermission(Integer permission) {
+ this.permission = permission;
+ }
+
public String getLicensekey() {
return licensekey;
}
diff --git a/src/main/java/kr/wisestone/owl/web/form/ApiIssueAddForm.java b/src/main/java/kr/wisestone/owl/web/form/ApiIssueAddForm.java
index 9a8d273..788438e 100644
--- a/src/main/java/kr/wisestone/owl/web/form/ApiIssueAddForm.java
+++ b/src/main/java/kr/wisestone/owl/web/form/ApiIssueAddForm.java
@@ -11,6 +11,8 @@
private String token;
@ApiParam(value = "�씠�뒋 �젣紐�")
private String title;
+ @ApiParam(value = "�씠�뒋 �궡�슜")
+ private String description;
@ApiParam(value = "�씠�뒋 ���엯 ID", required = true)
private Long issueTypeId;
@ApiParam(value = "�궗�슜�옄 �젙�쓽 �븘�뱶", required = true)
@@ -50,4 +52,12 @@
public void setIssueTypeId(Long issueTypeId) {
this.issueTypeId = issueTypeId;
}
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
}
--
Gitblit v1.8.0