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

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

@@ -419,6 +419,7 @@ var columnDefsGoodsInfo = [
 					return option;
 				}
 			},
+			{ headerName: "배송구분", field: "shotDelvGb", width: 80, cellClass: 'text-center' },
 			{headerName: "브랜드"		, field: "brandGroupNm"	, width: 80, cellClass: 'text-center'},
 			{headerName: "옵션1"		, field: "colorNm"		, width: 60, cellClass: 'text-center'},
 			{headerName: "옵션2"		, field: "optCd2"		, width: 60, cellClass: 'text-center'},