Merge remote-tracking branch 'origin/master'

src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/DlivyListInqireRForm.jsp

@@ -820,6 +820,7 @@
 			tr += '    <td class="left">';
 			tr += '        <div class="order-number">';
 			tr += '            <div class="order-number__content ' + ordrSttus + '">';
+			tr += '                <p>' + data.ordrInnb + '</p></br>';
 			tr += '                <button class="fs-13 under-line" onclick="fn_go_dlivy_dtl2(\'' + data.dlivyInnb + '\', \'' + data.ordrInnb + '\'); return false;">' + data.dlivyCdNb + '</button>';
 			tr += '                <div class="order-number__btn-container">';
 			tr += '                    <button type="button" onclick="fn_go_ordr_dtstmn_dwld_popup(\'' + data.dlivyInnb + '\', \'' + data.ordrInnb + '\')">';
@@ -1947,7 +1948,7 @@
 								<th>번호</th>
 								<th>원주문</th>
 								<th>상태변경일시</th>
-								<th>출고번호</th>
+								<th>주문번호</br>출고번호</th>
 								<th>출고상품</th>
 								<th>수(종)</th>
 								<th>받는분/주문자</th>