Merge branch 'style' into jmh

src/main/java/com/style24/persistence/mybatis/shop/TsfGoods.xml

@@ -848,7 +848,7 @@
 		                             AND B.USE_YN = 'Y'
 		                             AND G.DELV_LOC_CD = B.DELV_LOC_CD 
 		INNER JOIN TB_SHIP_COMPANY SC ON B.SHIP_COMP_CD = SC.SHIP_COMP_CD
-		                              AND SC.USE_YN = 'Y'
+		                             -- AND SC.USE_YN = 'Y' /*cj대한통운 이슈로 체크제외*/
 		WHERE G.GOODS_CD = #{goodsCd}
 		ORDER BY A.DELV_FEE_CD 
 		LIMIT 1

src/main/webapp/WEB-INF/views/mob/common/fragments/FooterMob.html

@@ -39,14 +39,14 @@
 						<li class="fn">사업자등록번호 : 116-81-32499 </li>
 <!--						<li class="fn">개인정보관리책임자 : 이정득 </li>-->
 						<li class="fn">통신판매업신고번호 : 제 2020-서울영등포-1432</li>
-						<li class="fn">개인정보보호책임자 : 박중재</li>
+						<li class="fn">개인정보보호책임자 : 배기영</li>
 						<li class="fn">호스팅 서비스 : 아이스타일이십사㈜</li>
 					</ul>
 				</div>
 
 				<ul class="link">
-					<li th:if="${(isApp == null || isApp == 'false' || isApp == '')}"><a href="http://www.ftc.go.kr/bizCommPop.do?wrkr_no=2298137000" target="_blank" title="새창 열림">사업자정보확인</a></li>
-					<li th:if="${isApp != null && isApp == 'true'}"><a href="public://?link=http://www.ftc.go.kr/bizCommPop.do?wrkr_no=2298137000" target="_blank" title="새창 열림">사업자정보확인</a></li>
+					<li th:if="${(isApp == null || isApp == 'false' || isApp == '')}"><a href="http://www.ftc.go.kr/bizCommPop.do?wrkr_no=1168132499" target="_blank" title="새창 열림">사업자정보확인</a></li>
+					<li th:if="${isApp != null && isApp == 'true'}"><a href="public://?link=http://www.ftc.go.kr/bizCommPop.do?wrkr_no=1168132499" target="_blank" title="새창 열림">사업자정보확인</a></li>
 					<li th:if="${(isApp == null || isApp == 'false' || isApp == '')}"><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_VIEW_NORMAL);">PC버전</a></li>
 					<li th:if="${(isApp == null || isApp == 'false' || isApp == '') && osType == 'A'}"><a href="https://play.google.com/store/apps/details?id=com.istyle24.commerce" target="_blank" class="wivisapp">APP 다운로드</a></li>
 					<li th:if="${(isApp == null || isApp == 'false' || isApp == '') && osType == 'I'}"><a href="https://apps.apple.com/kr/app/id627774402?mt=8" target="_blank" class="wivisapp">APP 다운로드</a></li>

src/main/webapp/WEB-INF/views/mob/order/OrderCompleteMob.html

@@ -48,7 +48,7 @@
 									<th>은행명/명의자</th>
 									<td>
 										<div>
-											<span th:text="${orderInfo.cardNm}"></span>/<span th:text="${orderInfo.ordNm}"></span>
+											<span th:text="${orderInfo.cardNm}"></span>/<span th:text="${orderInfo.vaNm}"></span>
 										</div>
 									</td>
 								</tr>

src/main/webapp/WEB-INF/views/web/common/fragments/FooterWeb.html

@@ -69,8 +69,8 @@
 								<span>주소: 서울시 영등포구 은행로 <em data-font="lato">11</em>, <em data-font="lato">8</em>층 (여의도동, 일신빌딩)</span> <br>
 								<span>사업자등록번호: <em data-font="lato">116-81-32499</em></span>
 								<span>통신판매업 신고번호: 제<rm data-font="lato">2020</rm>-서울영등포-<rm data-font="lato">1432</rm></span>
-								<span><a class="clickable" href="http://www.ftc.go.kr/bizCommPop.do?wrkr_no=2298137000" target="_blank" title="새창 열림">사업자정보확인</a></span><br>
-								<span>개인정보보호책임자 : 박중재</span>
+								<span><a class="clickable" href="http://www.ftc.go.kr/bizCommPop.do?wrkr_no=1168132499" target="_blank" title="새창 열림">사업자정보확인</a></span><br>
+								<span>개인정보보호책임자 : 배기영</span>
 								<span>호스팅 서비스사업자 : 아이스타일이십사(주)</span>
 							</p>
 						</div>
@@ -85,7 +85,7 @@
 							<p>
 								고객님은 안전거래를 위해 현금 결제 시 저희 쇼핑몰이 가입한<br>
 								소비자피해보상보험 서비스를 이용하실 수 있습니다.
-								<a class="clickable" href="https://mall.sgic.co.kr/csh/iutf/sh/shop/CSHINFO004VM0.mvc?tm=3&q_sk=2&q_sv=2298137000" target="_blank" title="새창 열림">가입정보확인</a>
+								<a class="clickable" href="https://mall.sgic.co.kr/csh/iutf/sh/shop/CSHINFO004VM0.mvc?tm=3&q_sk=2&q_sv=1168132499" target="_blank" title="새창 열림">가입정보확인</a>
 							</p>
 						</div>
 					</dd>

src/main/webapp/WEB-INF/views/web/order/OrderCompleteWeb.html

@@ -45,7 +45,7 @@
 								<th:block th:if="${orderInfo.payMeans} == 'G014_20'">
 									<div>
 										<dt>무통장입금정보</dt>
-										<dd><span th:text="${orderInfo.cardNm}"></span>(<span th:text="${orderInfo.ordNm}"></span>)&nbsp;/&nbsp;<span th:text="${orderInfo.vaNo}"></span></dd>
+										<dd><span th:text="${orderInfo.cardNm}"></span>(<span th:text="${orderInfo.vaNm}"></span>)&nbsp;/&nbsp;<span th:text="${orderInfo.vaNo}"></span></dd>
 									</div>
 									<div class="closedate">
 										<dt>입금마감</dt>