Merge remote-tracking branch 'origin/master'

src/main/webapp/WEB-INF/views/mngr/setup/ordr/OrdrListR.jsp

@@ -133,7 +133,7 @@
 		<div class="content__inner">
 			<button class="side-nav__fold"><span class="visually-hidden">좌측메뉴 펼치기/닫기</span></button>
 			<div class="page-title">
-				<h2 class="page-title__title">주문 설정</h2>
+				<h2 class="page-title__title">마일리지 설정</h2>
 				<div class="page-title__btn-container">
 					<button type="button" class="btn primary" onclick="fn_save_ordrSetup(); return false;">
 						<spring:message code="button.save"/></button>