Merge branch 'jsshin' into develop

src/main/java/com/style24/front/biz/service/TsfCouponService.java

@@ -305,6 +305,7 @@ public class TsfCouponService {
 		Coupon joinCoupon = couponDao.getJoinCoupon(coupon);
 		if (joinCoupon != null) {
 			CustCoupon custCoupon = new CustCoupon();
+			custCoupon.setCustNo(coupon.getCustNo());
 			custCoupon.setCpnId(joinCoupon.getCpnId());
 			custCoupon.setAvailStdt(joinCoupon.getAvailStdt());
 			custCoupon.setAvailEddt(joinCoupon.getAvailEddt());

src/main/java/com/style24/front/biz/service/TsfCustomerService.java

@@ -323,6 +323,7 @@ public class TsfCustomerService {
 	public void saveJoinPostProcessing(Customer customer) {
 		// 1. 쿠폰지급 : 운영관리 > 회원등급정책관리 > WELCOME 등급
 		Coupon coupon = new Coupon();
+		coupon.setCustNo(customer.getCustNo());
 		coupon.setFrontGb(customer.getFrontGb());
 		coupon.setCustGrade(customer.getCustGrade());
 		coupon.setCustNo(customer.getCustNo());

src/main/java/com/style24/front/support/config/TsfRedisSessionConfig.java

@@ -86,7 +86,7 @@ public class TsfRedisSessionConfig extends AbstractHttpSessionApplicationInitial
 		DefaultCookieSerializer serializer = new DefaultCookieSerializer();
 		serializer.setCookiePath("/");
 		serializer.setUseBase64Encoding(false);
-
+		// TODO : SSL 적용 후 주석 풀고 테스트 해야함 2021-04-13
 		// SSL인증서 적용 시 주석 제거
 //		serializer.setUseSecureCookie(true);
 //		serializer.setSameSite("NONE");

src/main/webapp/WEB-INF/views/mob/customer/IdFindFormMob.html

@@ -23,7 +23,7 @@
 		<section class="content mb_idInquiry_1">
 			<div class="inner">
 				<div class="close">
-					<a href="javascript:void(0);" class="btn_close"><span></span><span></span></a>
+					<a href="javascript:void(0);" class="btn_close" onclick="cfnGoToPage(_PAGE_MAIN);"><span></span><span></span></a>
 				</div>
 			</div>
 			<div class="inner">