Merge branch 'sowon' into develop

src/main/java/com/style24/front/biz/web/TsfPlanningController.java

@@ -171,7 +171,9 @@ public class TsfPlanningController extends TsfBaseController {
 		mav.addObject("planInfo", planInfo);
 
 		mav.addObject("planCount", planningService.getPlanAllCount(plan));
-
+		// 템플릿 순서
+		mav.addObject("templateOrd", planningService.templateDispOrdInfo(plan));
+		
 		// 상단소스
 		plan.setFrontGb("T");
 		mav.addObject("fsrcInfoTop", planningService.getPlanFsrcInfo(plan));
@@ -180,9 +182,6 @@ public class TsfPlanningController extends TsfBaseController {
 		plan.setFrontGb("B");
 		mav.addObject("fsrcInfoBtm", planningService.getPlanFsrcInfo(plan));
 
-		// 템플릿 순서
-		mav.addObject("templateOrd", planningService.templateDispOrdInfo(plan));
-
 		// 리뷰
 		mav.addObject("reviewInfo", planningService.getPlanReviewInfo(review));
 

src/main/webapp/WEB-INF/views/web/planning/PlanningDetailFormWeb.html

@@ -98,9 +98,6 @@
 				<th:block th:if="${a.tmplType == 'G082_30'}">
 						<div class="content dp_mid_banner" th:id="${a.tmplType}"></div> <!-- //이미지-->
 					</th:block>
-				<th:block th:if="${a.tmplType == 'G082_40'}">
-						<div class="coner_item01" th:id="${a.tmplType}"></div>
-					</th:block>
 				<th:block th:if="${a.tmplType == 'G082_50'}">
 						<div class="content dp_special" th:id="${a.tmplType + a.planContSq}"></div>
 				</th:block>
@@ -111,6 +108,7 @@
 						<div class="content dp_special" th:id="${a.tmplType + a.planContSq}"></div>
 				</th:block>
 			</th:block>
+			<div class="coner_item01" th:utext="${#strings.replace(#strings.replace(fsrcInfoBtm.fsrcPc,'&amplt;','<'),'&ampgt;','>')}"></div>
 			
 			 <!-- 댓글리스트 -->
 			<th:block th:if="${planInfo.replyYn == 'Y'}">