Merge branch 'develop' into jmh

src/main/java/com/style24/front/biz/web/TsfOrderController.java

@@ -1207,6 +1207,7 @@ public class TsfOrderController extends TsfBaseController {
 					replaceInfo.set("orderFreegiftInfo"	, resultMap.get("orderFreegiftInfo"));
 					
 					replaceInfo.set("vaBankNm"			, orderInfo.getCardNm());
+					replaceInfo.set("custNo"			, order.getCustNo());
 					
 					// 2021.07.29
 					String vaDeadline = "";

src/main/webapp/WEB-INF/views/mob/mypage/MypageCustDeliveryAddrFormMob.html

@@ -106,7 +106,12 @@
 				html +=	'            <div class="ship_request">\n';
 				html +=	'                <dl>\n';
 				html +=	'                    <dt>배송요청 사항</dt>\n';
-				html +=	'                    <dd>'+custDeliveryAddr.delvMemo+'</dd>\n';
+				// 2021.08.24 null 처리
+				if (custDeliveryAddr.delvMemo == null || custDeliveryAddr.delvMemo == '') {
+					html +=	'                    <dd></dd>\n';
+				} else {
+					html +=	'                    <dd>'+custDeliveryAddr.delvMemo+'</dd>\n';
+				}
 				html +=	'                </dl>\n';
 				html +=	'            </div>\n';
 				html +=	'        </dl>\n';

src/main/webapp/WEB-INF/views/web/mypage/MypageCustDeliveryAddrFormWeb.html

@@ -106,7 +106,13 @@
 				html +=	'                   <span>'+custDeliveryAddr.recipBaseAddr + custDeliveryAddr.recipDtlAddr +'</span>\n';
 				html +=	'                </li>\n';
 				html +=	'                <li>\n';
-				html +=	'                   배송요청 사항&nbsp;:&nbsp;<span>'+ custDeliveryAddr.delvMemo +'</span>\n';
+				// 2021.08.24 null 처리
+				if (custDeliveryAddr.delvMemo == null || custDeliveryAddr.delvMemo == '') {
+					html +=	'                   배송요청 사항&nbsp;:&nbsp;<span></span>\n';
+				} else {
+					html +=	'                   배송요청 사항&nbsp;:&nbsp;<span>'+ custDeliveryAddr.delvMemo +'</span>\n';
+				}
+				
 				html +=	'                </li>\n';
 				html +=	'            </ul>\n';
 				html +=	'        </div>\n';