Merge branch 'eskim' into develop

src/main/webapp/WEB-INF/views/marketing/CardPromotionPopupForm.html

@@ -104,7 +104,7 @@
 						</th>
 						<td><input type="text" class="w500" id="linkUrl" name="linkUrl"  maxlength="150" data-valid-name="연결URL"  th:value="${cardPrmt.linkUrl}"/></td>
 					</tr>
-					<tr>
+					<tr id="dcGb3Note" th:class="${(cardPrmtSq > 0 and cardPrmt.dcGb =='3')? 'on': 'off'}">
 						<th>유의사항</th>
 						<td  colspan="3">
 						<textarea class="textareaR2" name="note" id="note" th:field="${cardPrmt.note}"></textarea>
@@ -191,7 +191,9 @@
 			$("#cardPromotionForm input[name=dcVal]").val('');
 			$("#cardPromotionForm input[name=maxDcAmt]").val('');
 			$("#cardPromotionForm").find('#contionArea').removeClass('on').addClass('off');
+			$("#cardPromotionForm").find('#dcGb3Note').removeClass('off').addClass('oon');
 		}else{
+			$("#cardPromotionForm").find('#dcGb3Note').removeClass('on').addClass('off');
 			$("#cardPromotionForm").find('#contionArea').removeClass('off').addClass('on');
 		}
 	});