Merge branch 'advc' into hylee

Conflicts:
	src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp
This commit is contained in:
hylee 2023-07-14 12:24:34 +09:00
commit 503d6b4eaa

View File

@ -1038,7 +1038,6 @@
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<button type="button" class="btnType04" data-tooltip="instrInfo_pop01" onclick="selectInstrInfo('${list.eduAplctOrd}')" title="팝업 열림">${cryptoUtil.decrypt(list.instrNm) }</button> <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:otherwise>
</c:choose> </c:choose>
</td> </td>