Merge branch 'jsshin' into develop

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

@@ -29,6 +29,7 @@ public class TsfKakaoService {
 	@Autowired
 	private TscCustomerService coreCustomerService;
 
+	public static final String siteNm = "STYLE24";
 
 	/**
 	 * 가입축하 알림톡
@@ -44,7 +45,7 @@ public class TsfKakaoService {
 		dm.setFkkoresendtype("LMS");
 
 		GagaMap replaceInfo = new GagaMap();
-		replaceInfo.setString("siteNm", TscConstants.Style24Infomation.SITE_NAME.value());
+		replaceInfo.setString("siteNm", siteNm);
 		replaceInfo.setString("custNm", customer.getCustNm());
 		kakaoSender.send(SsgKakaoSender.KakaoAnswerSq.JoinCongrat.value(), dm, replaceInfo);
 

src/main/webapp/WEB-INF/views/web/customer/JoinFormWeb.html

@@ -126,7 +126,7 @@
 					<div class="form_field">
 						<label class="input_label sr-only">휴대폰번호</label>
 						<div class="input_wrap form_full">
-							<input type="text" id="cellPhnno" name="cellPhnno" placeholder="휴대폰번호" class="form_control" minlength="10" maxlength="11" required="required" data-valid-type="numeric" data-valid-name="휴대폰번호" />
+							<input type="text" id="cellPhnno" name="cellPhnno" placeholder="휴대폰 인증 해주세요." class="form_control" minlength="10" maxlength="11" required="required" data-valid-type="numeric" data-valid-name="휴대폰"/>
 							<!-- case (휴대폰번호 형식이 맞지 않을경우,이미 가입되어있는 핸드폰번호일경우) -->
 							<div class="help_block">
 								<!-- 휴대폰번호 형식이 맞지 않을경우 -->
@@ -397,7 +397,7 @@
 		}
 	};
 
-	// 본인이증 후 결과
+	// 본인인증 후 결과
 	var fnInfoConfirmCallBack = function (result) {
 		// const $cellPhnno = $('#cellPhnno');
 		const $dupPhnno = $('#dupPhnno');