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

wyu

2022-01-07 8b30703c3917d6f07292b184212f65bd03bb2b5a

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

 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;
        }


 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;
    }

 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;
    }
}