From 6a5fb9dcd9fe96d62b5dbbcc2bd48db478706389 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 26 11월 2021 15:56:22 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/vo/IssueVo.java | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/vo/IssueVo.java b/src/main/java/kr/wisestone/owl/vo/IssueVo.java
index 61fa139..0d975f9 100644
--- a/src/main/java/kr/wisestone/owl/vo/IssueVo.java
+++ b/src/main/java/kr/wisestone/owl/vo/IssueVo.java
@@ -1,6 +1,7 @@
package kr.wisestone.owl.vo;
import com.google.common.collect.Lists;
+import kr.wisestone.owl.domain.IssueTableConfig;
import java.util.ArrayList;
import java.util.List;
@@ -51,10 +52,14 @@
private Long issueCommentCount;
private String modifyByName; // 蹂�寃쎌옄 �젙蹂� - �씠�뒋 蹂�寃� �젙蹂� �긽�꽭 �솗�씤�뿉�꽌 �궗�슜
private WorkflowStatusVo workflowStatusVo;
- private Long parentIssueId; // �긽�쐞 �씪媛�
+ //private Long parentIssueId; // �긽�쐞 �씪媛�
+ private IssueVo parentIssueVo;
+
private List<IssueCompanyVo> issueCompanyVos;
private List<IssueIspVo> issueIspVos;
private List<IssueHostingVo> issueHostingVos;
+
+ private List<UseCompanyVo> useCompanyVo = Lists.newArrayList();
public IssueVo(){}
@@ -410,14 +415,6 @@
this.departmentVos = departmentVos;
}
- public Long getParentIssueId() {
- return parentIssueId;
- }
-
- public void setParentIssueId(Long parentIssueId) {
- this.parentIssueId = parentIssueId;
- }
-
public List<IssueVo> getIssueDownVos() {
return issueDownVos;
}
@@ -426,5 +423,19 @@
this.issueDownVos = issueDownVos;
}
+ public IssueVo getParentIssueVo() {
+ return parentIssueVo;
+ }
+ public void setParentIssueVo(IssueVo parentIssueVo) {
+ this.parentIssueVo = parentIssueVo;
+ }
+
+ public List<UseCompanyVo> getUseCompanyVo() {
+ return useCompanyVo;
+ }
+
+ public void setUseCompanyVo(List<UseCompanyVo> useCompanyVo) {
+ this.useCompanyVo = useCompanyVo;
+ }
}
--
Gitblit v1.8.0