Merge branch 'sowon' into develop

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

@@ -590,6 +590,7 @@
 		  AND A.CPN_ID = B.CPN_ID 
 		  AND B.CUST_NO = #{custNo}
 		  AND A.CPN_STAT = 'G232_11'
+		  AND NOW() BETWEEN A.AVAIL_STDT AND A.AVAIL_EDDT
 	</select>
 	
 	<select id="getCouponDetailInfo" resultType="Coupon" parameterType="Coupon">

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

@@ -64,7 +64,7 @@
 											<li>
 												<!-- 쿠폰사용 기한 -->
 												<div
-													th:class="${CouponData.userYn == 'coupon' ? '' : 'coupon disabled'}">
+													th:class="${CouponData.userYn == 'Y' ? 'coupon' : 'coupon disable'}">
 													<div>
 														<p class="cp_name" th:text="${CouponData.cpnNm}"></p>
 														<p class="cp_cont">