Merge branch 'tolag'

Conflicts:
	src/main/webapp/WEB-INF/jsp/kccadr/sendMgr/emailSendMgr.jsp

src/main/webapp/WEB-INF/jsp/kccadr/sendMgr/emailSendMgr_back.jsp

@@ -49,13 +49,6 @@
 		var emailContent = $("#emailContent").val();
 		
 
-		var emailTop = $("#emailTop").val();
-		var emailBottom = $("#emailBottom").val();
-		
-		emailContent = emailTop + emailContent + emailBottom;
-		
-		
-
 		if(sendLength == 0){
 			alert("수신 메일주소를 입력해 주세요");
 			return;
@@ -69,7 +62,6 @@
 			return;
 		}
 		
-		$("#emailSendContent").val(emailContent);
 		
 		//전송 메일주소 배열 생성
 		var emailArr = new Array(sendLength);
@@ -102,11 +94,11 @@
 				console.log("ERROR : ", e); 
 			}
 		});
+		
 	}
 </script>
 <form id="emailForm" name="emailForm" method="post">
 	<input type="hidden" id="emailList" name="emailList"/>
-	<input type="hidden" id="emailSendContent" name="emailSendContent"/>
 	<!-- cont -->
 	<div class="cont_wrap">
 		<div class="box">
@@ -140,24 +132,12 @@
 									<input type="text" size="100" id="emailTitle" name="emailTitle">
 								</td>
 							</tr>
-							<tr>
-								<th>발송탬플릿</th>
-								<td>
-									<textarea name="emailTop" id="emailTop" cols="30" rows="10" readonly="readonly"><c:out value="${emailTop}"/></textarea>
-								</td>
-							</tr>
 							<tr>
 								<th>발송내용</th>
 								<td>
 									<textarea name="emailContent" id="emailContent" cols="30" rows="10"></textarea>
 								</td>
 							</tr>
-							<tr>
-								<th>발송탬플릿</th>
-								<td>
-									<textarea name="emailBottom" id="emailBottom" cols="30" rows="10" readonly="readonly"><c:out value="${emailBottom}"/></textarea>
-								</td>
-							</tr>
 							<tr>
 								<th>수신메일주소</th>
 								<td>