tolag3/koipa_edu_2025-1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

충돌 수정

Browse Source
This commit is contained in:
hylee 2023-11-28 10:32:24 +09:00
parent ef4b387b49
commit f62a1ef9a5
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java
View File

@ -1780,6 +1780,12 @@ public class VEEduAplctVO extends ComDefaultVO implements Serializable {
public void setQustnrRsltCnt(String qustnrRsltCnt) { public void setQustnrRsltCnt(String qustnrRsltCnt) {
this.qustnrRsltCnt = qustnrRsltCnt; this.qustnrRsltCnt = qustnrRsltCnt;
} }
public Boolean getQestRsltExists() {
return qestRsltExists;
}
public void setQestRsltExists(Boolean qestRsltExists) {
this.qestRsltExists = qestRsltExists;
}
} }

12
src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java
View File

@ -41,6 +41,8 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable {
private String atchFileId; //첨부파일아이디 private String atchFileId; //첨부파일아이디
private String atchFileNm; //첨부파일아이디 private String atchFileNm; //첨부파일아이디
private String instrNm; //
//ve_edu_aplct //ve_edu_aplct
private String eduAplctOrd; //교육신청순번 private String eduAplctOrd; //교육신청순번
private List<String> eduAplctOrdList; //교육신청순번 private List<String> eduAplctOrdList; //교육신청순번
@ -796,16 +798,18 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable {
public void setRespondId(String respondId) { public void setRespondId(String respondId) {
this.respondId = respondId; this.respondId = respondId;
} }
<<<<<<< HEAD
public String getLctrPlanRsltAtchFileId() { public String getLctrPlanRsltAtchFileId() {
return lctrPlanRsltAtchFileId; return lctrPlanRsltAtchFileId;
} }
public void setLctrPlanRsltAtchFileId(String lctrPlanRsltAtchFileId) { public void setLctrPlanRsltAtchFileId(String lctrPlanRsltAtchFileId) {
this.lctrPlanRsltAtchFileId = lctrPlanRsltAtchFileId; this.lctrPlanRsltAtchFileId = lctrPlanRsltAtchFileId;
} }
======= public String getInstrNm() {
return instrNm;
>>>>>>> refs/heads/hylee }
public void setInstrNm(String instrNm) {
this.instrNm = instrNm;
}
} }