Merge branch 'advc' into hylee
Conflicts: src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp
This commit is contained in:
commit
503d6b4eaa
@ -1038,7 +1038,6 @@
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<button type="button" class="btnType04" data-tooltip="instrInfo_pop01" onclick="selectInstrInfo('${list.eduAplctOrd}')" title="팝업 열림">${cryptoUtil.decrypt(list.instrNm) }</button>
|
||||
<%-- <c:out value="${cryptoUtil.decrypt(list.instrNm) }" /> --%>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</td>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user