Merge branch 'sowon' into develop

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

@@ -312,7 +312,7 @@
 											<td class="dcCdCheck2">
 												<input type="text" class="w200" name="onePubQty" id="onePubQty" value="1" required="required" data-valid-name="1회발행수량" data-valid-type="numeric" style="text-align: right;">개
 											</td>
-											<th class="downAblArea">상픔상세노출여부<em class="required" title="필수"></em></th>
+											<th class="downAblArea">다운로드가능여부<em class="required" title="필수"></em></th>
 											<td class="downAblArea">
 												<select name="downAblYn" id="downAblYn" required="required" data-valid-name="다운로드가능여부">
 													<option value="Y">Y</option>

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

@@ -124,7 +124,7 @@
 								<option th:if="${useYnList}" th:each="oneData, status : ${useYnList}" th:value="${oneData.cd}" th:selected="${oneData.cd} == 'Y'" th:text="|${oneData.cdNm}|"></option>
 							</select>
 						</td>
-						<th>오픈여부<em class="required" title="필수"></em></th>
+						<th>노출여부<em class="required" title="필수"></em></th>
 						<td>
 							<select name="openYn" th:field="*{openYn}">
 								<option th:if="${useYnList}" th:each="oneData, status : ${useYnList}" th:value="${oneData.cd}" th:selected="${oneData.cd} == 'Y'" th:text="|${oneData.cdNm}|"></option>
@@ -176,7 +176,7 @@
   						</td>
 					</tr>
 					<tr>
-						<th>메인 이미지<i id="pMimgStar"></i><br/>[삭제여부<label class="chkBox"><input type="checkbox" name="orgMainPimgDelYn" value="Y"/></label>]</th>
+						<th>목록 이미지<i id="pMimgStar"></i><br/>[삭제여부<label class="chkBox"><input type="checkbox" name="orgMainPimgDelYn" value="Y"/></label>]</th>
 						<td>
 							<div th:if=*{mainPimg} id="mainPimgView" style="float:left;">
 								<img id="PreMainPimgUrl" th:src="${@environment.getProperty('upload.image.view')} + *{mainPimg}" style="max-width:470px;"/>
@@ -456,13 +456,13 @@
 						<th>프론트 구분<em class="required" title="필수"></em></th>
 						<td>
 							<label class="chkBox" >
-								<input type="checkbox" name="frontGb" value="P" th:text="PC웹"/>
+								<input type="checkbox" name="frontGb" value="P" th:text="PC웹" checked="checked"/>
 							</label>
 							<label class="chkBox" >
-								<input type="checkbox" name="frontGb"  value="M" th:text="모바일웹"/>
+								<input type="checkbox" name="frontGb"  value="M" th:text="모바일웹" checked="checked"/>
 							</label>
 							<label class="chkBox" >
-								<input type="checkbox" name="frontGb" value="A" th:text="모바일앱"/>
+								<input type="checkbox" name="frontGb" value="A" th:text="모바일앱" checked="checked"/>
 							</label>
 						</td>
 						<th>전시순서</th>
@@ -518,7 +518,7 @@
 								<option th:if="${useYnList}" th:each="oneData, status : ${useYnList}" th:value="${oneData.cd}" th:selected="${oneData.cd} == 'Y'" th:text="|${oneData.cdNm}|"></option>
 							</select>
 						</td>
-						<th>오픈여부<em class="required" title="필수"></em></th>
+						<th>노출여부<em class="required" title="필수"></em></th>
 						<td colspan="3">
 							<select name="openYn" required="required" data-valid-name="오픈여부">
 								<option th:if="${useYnList}" th:each="oneData, status : ${useYnList}" th:value="${oneData.cd}" th:selected="${oneData.cd} == 'Y'" th:text="|${oneData.cdNm}|"></option>
@@ -538,7 +538,7 @@
 						<th>사용가능고객구분<em class="required" title="필수"></em></th>
 						<td>
 							<label class="chkBox" th:if="${usableCustGbList}" th:each="oneData, status : ${usableCustGbList}">
-								<input type="checkbox" name="usableCustGbArr" th:value="${oneData.cd}" th:text="${oneData.cdNm}"/>
+								<input type="checkbox" name="usableCustGbArr" th:value="${oneData.cd}" th:text="${oneData.cdNm}" checked="checked"/>
 							</label>
   						</td>
 					</tr>
@@ -571,7 +571,7 @@
   						</td>
 					</tr>
 					<tr>
-						<th>메인 이미지<i id="pMimgStar"></i></th>
+						<th>목록 이미지<i id="pMimgStar"></i></th>
 						<td colspan="5">
 							<div class="uFile w400">
 								<input id="registerMainPimg" name="registerMainPimg" type="file" accept="image/*" class="uFileInput w400"/>
@@ -1604,7 +1604,7 @@
 				}else{false;}
     		}
     	},
-    	{headerName: "포인트적용일", field: "pntUsableDay", width: 100, cellClass: 'text-center', cellEditor: 'numericCellEditor'
+    	{headerName: "유효기간(일수)", field: "pntUsableDay", width: 100, cellClass: 'text-center', cellEditor: 'numericCellEditor'
 			,cellEditorParams: { maxlength: 3, required: true }
     	    , editable: function(params) { 
 	    		if (params.data.benefit == '포인트' || params.data.benefit == '포인트/쿠폰') {