Merge branch 'sowon' into develop

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

@@ -186,6 +186,12 @@
 							</div>
 						</td>
 					</tr>
+					<tr>
+						<th>투표일련번호</th>
+						<td>
+							<input type="text" class="w100 aR" name="pollSq" th:field="*{pollSq}"/>
+						</td>
+					</tr>
 					<tr>
 						<th>댓글여부</th>
 						<td colspan="3">
@@ -212,12 +218,6 @@
 							<label class="rdoBtn"><input type="radio" name="replyLoc" value="U" />상품리스트 상단</label>
 							<label class="rdoBtn"><input type="radio" name="replyLoc" value="D"/>상품리스트 하단</label>
 						</td>
-						
-						<th>투표일련번호</th>
-						<td>
-							<input type="text" class="w100 aR" name="pollSq" th:field="*{pollSq}"/>
-						</td>
-					
 					</tr>
 					<tr style="display:none" id="append3">
 						<th>댓글이미지<br/>[삭제여부<label class="chkBox"><input type="checkbox" name="orgReplyImgDelYn" value="Y"/></label>]</th>
@@ -513,6 +513,14 @@
 							</div>
 						</td>
 					</tr>
+					<tr>
+									
+						<th>투표일련번호</th>
+						<td>
+							<input type="text" class="w100 aR" name="pollSq"/>
+						</td>
+					
+					</tr>
 					<tr>
 						<th>댓글여부<em class="required" title="필수"></em></th>
 						<td colspan="5">
@@ -539,12 +547,6 @@
 							<label class="rdoBtn"><input type="radio" name="replyLoc" value="U"/>상품리스트 상단</label>
 							<label class="rdoBtn"><input type="radio" name="replyLoc" value="D"/>상품리스트 하단</label>
 						</td>
-						
-						<th>투표일련번호</th>
-						<td>
-							<input type="text" class="w100 aR" name="pollSq"/>
-						</td>
-					
 					</tr>
 					<tr style="display:none" id="append3">
 						<th>댓글이미지</th>