Merge branch 'card007' into develop

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

@@ -35,7 +35,7 @@
 					<th:block th:unless="${oneData.giftPackYn == 'Y'}">
 						<div class="goods_date">주문일<span class="date" th:text="${oneData.ordDt}"></span></div>
 					</th:block>
-					<th:block th:if="${oneData.chgStat == 'G685_20' or oneData.chgStat == 'G685_21'}">
+					<th:block th:if="${oneData.wdBfSendYn == 'N' and (oneData.chgStat == 'G685_20' or oneData.chgStat == 'G685_21')}">
 						<a href="javascript:void(0);" th:attr="ordNo=${oneData.ordNo}, ordChgSq=${oneData.ordChgSq}, cancelGb=${oneData.chgGb}" onclick="fnCreCancel(this);" class="detail_btn">전체신청취소</a>
 					</th:block>
 				</div>

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

@@ -30,7 +30,7 @@
 			<div class="part_goods">
 				<div class="goods_top">
 					<div class="goods_date">주문일<span class="date" th:text="${oneData.ordDt}"></span></div>
-					<th:block th:if="${oneData.chgStat == 'G685_20' or oneData.chgStat == 'G685_21'}">
+					<th:block th:if="${oneData.wdBfSendYn == 'N' and (oneData.chgStat == 'G685_20' or oneData.chgStat == 'G685_21')}">
 						<a href="javascript:void(0);" th:attr="ordNo=${oneData.ordNo}, ordChgSq=${oneData.ordChgSq}, cancelGb=${oneData.chgGb}" onclick="fnCreCancel(this, 'noMember');" class="detail_btn">전체신청취소</a>
 					</th:block>
 				</div>

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

@@ -40,7 +40,7 @@
 						<div class="goods_head">
 							<p th:unless="${oneData.giftPackYn == 'Y'}">주문일 <span th:text="${oneData.ordDt}"></span></p>
 							<p th:if="${oneData.giftPackYn == 'Y'}">선물일 <span th:text="${oneData.ordDt}"></span></p>
-							<a href="javascript:void(0)" th:if="${oneData.chgStat == 'G685_20' or oneData.chgStat == 'G685_21'}" th:attr="ordNo=${oneData.ordNo}, ordChgSq=${oneData.ordChgSq}, cancelGb=${oneData.chgGb}" onclick="fnCreCancel(this);">전체신청취소</a>
+							<a href="javascript:void(0)" th:if="${oneData.wdBfSendYn == 'N' and (oneData.chgStat == 'G685_20' or oneData.chgStat == 'G685_21')}" th:attr="ordNo=${oneData.ordNo}, ordChgSq=${oneData.ordChgSq}, cancelGb=${oneData.chgGb}" onclick="fnCreCancel(this);">전체신청취소</a>
 						</div>
 						<div class="goods_cont">
 							<!-- 주문상품 -->

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

@@ -39,7 +39,7 @@
 					<div class="part_goods">
 						<div class="goods_head">
 							<p>주문일 <span th:text="${oneData.ordDt}"></span></p>
-							<a href="javascript:void(0)" th:if="${oneData.chgStat == 'G685_20' or oneData.chgStat == 'G685_21'}" th:attr="ordNo=${oneData.ordNo}, ordChgSq=${oneData.ordChgSq}, cancelGb=${oneData.chgGb}, noMember=noMember" onclick="fnCreCancel(this);">전체신청취소</a>
+							<a href="javascript:void(0)" th:if="${oneData.wdBfSendYn == 'N' and (oneData.chgStat == 'G685_20' or oneData.chgStat == 'G685_21')}" th:attr="ordNo=${oneData.ordNo}, ordChgSq=${oneData.ordChgSq}, cancelGb=${oneData.chgGb}, noMember=noMember" onclick="fnCreCancel(this);">전체신청취소</a>
 						</div>
 						<div class="goods_cont">
 							<!-- 주문상품 -->