Merge remote-tracking branch 'origin/ST24PRJ-14' into develop

src/main/webapp/WEB-INF/views/order/OrderDetailForm.html

@@ -36,8 +36,8 @@
 						<col width="6%"/>
 						<col width="10%"/>
 						<col width="10%"/>
-						<col width="6%"/>
 						<col width="14%"/>
+						<col width="6%"/>
 						<col width="7%"/>
 						<col width="9%"/>
 						<col width="12%"/>
@@ -52,8 +52,8 @@
 							<th>웹구분</th>
 							<th>제휴몰</th>
 							<th>주문일시</th>
-							<th>주문번호</th>
 							<th>제휴몰주문번호</th>
+							<th>주문번호</th>
 							<th>주문자</th>
 							<th>휴대폰번호</th>
 							<th>이메일</th>
@@ -71,8 +71,8 @@
 							<td th:text="${orderInfo[0].frontGbNm}"></td>
 							<td th:text="${orderInfo[0].extmallNm}"></td>
 							<td th:text="${orderInfo[0].ordDt}"></td>
-							<td th:text="${orderInfo[0].ordNo}"></td>
 							<td th:text="${orderInfo[0].extmallOrderId}"></td>
+							<td th:text="${orderInfo[0].ordNo}"></td>
 							<td th:text="${orderInfo[0].ordNm}"></td>
 							<td>
 								<a href="script:void(0)" class="lmsPop" th:attr="orderPhnno=${orderInfo[0].ordPhnno}"><th:block th:text="${orderInfo[0].ordPhnno}"></th:block></a>