Merge branch 'eskim' into develop

src/main/webapp/WEB-INF/views/mob/goods/GoodsDetailFormMob.html

@@ -340,10 +340,10 @@
 					<div style="height:4rem"></div><!-- 여백용 html -->
 					<th:block th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsTopDesc))}"></th:block>
 				</div>
-				<th:block th:if="${goodsInfo.tobeFormYn == 'N' and goodsInfo.goodsDesc != null  and !goodsInfo.goodsDesc.empty}" >	
+				<th:block th:if="${goodsInfo.tobeFormYn == 'N' and goodsInfo.goodsDesc != null  and !goodsInfo.goodsDesc.empty}" >
+				<div style="height:4rem"></div><!-- 여백용 html -->	
 				<div class="mdhtml_box"	>
-						<div style="height:4rem"></div><!-- 여백용 html -->
-						<div id="goodsDescHtml"></div>
+					<div id="goodsDescHtml"></div>
 				</div>
 				</th:block>
 					
@@ -434,9 +434,11 @@
 				<th:block th:if="${goodsInfo.goodsType == 'G056_S' and goodsComposeList != null and !goodsComposeList.empty}">
 				<th:block  th:each="goodsCompose, status : ${goodsComposeList}">
 					<th:block th:if="${ goodsCompose.tobeFormYn == 'N' and goodsCompose.goodsDesc != null  and !goodsCompose.goodsDesc.empty}" >
+					<div style="height:4rem"></div><!-- 여백용 html -->
 					<div class="mdhtml_box"	>
-						<div style="height:4rem"></div><!-- 여백용 html -->
-						<div th:id="${'goodsDescHtml_' + goodsCompose.compsGoodsCd}"></div>
+						<div class="mdhtml_box"	>
+							<div th:id="${'goodsDescHtml_' + goodsCompose.compsGoodsCd}"></div>
+						</div>
 					</div>
 					</th:block>
 					

src/main/webapp/WEB-INF/views/web/goods/GoodsDetailFormWeb.html

@@ -825,7 +825,9 @@
 				<th:block  th:each="goodsCompose, status : ${goodsComposeList}">
 					<th:block th:if="${ goodsCompose.tobeFormYn == 'N' and goodsCompose.goodsDesc != null  and !goodsCompose.goodsDesc.empty}" >
 						<div style="height:100px"></div>
+						<div class="mdhtml_box">
 						<div th:id="${'goodsDescHtml_' + goodsCompose.compsGoodsCd}"></div>
+						</div>
 					</th:block>
 
 					<th:block th:if="${goodsCompose.tobeFormYn == 'Y'}">