Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.admin into develop

src/main/java/com/style24/persistence/domain/GoodsSafeNo.java

@@ -14,8 +14,18 @@ import lombok.Data;
 @Data
 public class GoodsSafeNo extends TscBaseDomain {
 
+//	private String goodsCd;
+//	private String goodsNum;
+//	private String certNum;
+//	private String certState;
+//	private String certDiv;
+//	private String certOrganName;
+//	private String certDt;
+	
 	private String goodsCd;
-	private String goodsNum;
+	private String certTargetGb;
+	private String certFormGb;
+	private String certType;
 	private String certNum;
 	private String certState;
 	private String certDiv;

src/main/webapp/WEB-INF/views/goods/GoodsDetailForm.html

@@ -78,7 +78,8 @@
 							<li><a href="#goodstab3">상품상세정보</a></li>
 							<li id="goodsNotiTab"><a href="#goodstab4">고시정보</a></li>
 							<li id="goodsComposeTab" style="display:none;"><a href="#goodstab5">구성상품</a></li>
-							<li><a href="#goodstab6">변경이력</a></li>
+							<!-- <li><a href="#goodstab6">안전인증</a></li> -->
+							<li><a href="#goodstab7">변경이력</a></li>
 						</ul>
 					</div>
 					<!-- //TABS NAVI -->
@@ -569,8 +570,51 @@
 							</div>
 							<!-- //TAB6 CONTENTS AREA -->
 						</li>
-						<!-- TAB5 : 이력정보 -->
-						<li class="tab" id="goodstab6">
+						<!-- TAB6 : 이력정보 -->
+						<!-- <li class="tab" id="goodstab6">
+							TAB8 CONTENTS AREA
+							<div class="panelStyle">
+								<table class="frmStyle" th:with="uploadGoodsUrl=${@environment.getProperty('upload.goods.view')},uxImgUrl=${@environment.getProperty('domain.uximage')}">
+									<colgroup>
+										<col width="10%"/>
+										<col width="40%"/>
+										<col width="10%"/>
+										<col/>
+									</colgroup>
+									<tr>
+										<th>인증대상</th>
+										<td colspan="3"></td>
+									</tr>
+									<tr>	
+										<th>인증형태</th>
+										<td colspan="3"></td>
+									</tr>
+									<tr>	
+										<th>인증타입</th>
+										<td colspan="3"></td>
+									</tr>
+									<tr>	
+										<th>인증번호</th>
+										<td  colspan="3"></td>
+									</tr>
+									<tr>	
+										<th>인증상태</th>
+										<td></td>
+										<th>인증구분</th>
+										<td></td>
+									</tr>
+									<tr>	
+										<th>인증기관</th>
+										<td></td>
+										<th>인증일</th>
+										<td></td>
+									</tr>
+								</table>
+							</div>
+							//TAB5 CONTENTS AREA
+						</li> -->
+						<!-- //TAB7 : 이력정보 -->
+						<li class="tab" id="goodstab7">
 							<!-- TAB8 CONTENTS AREA -->
 							<div class="panelStyle">
 								<!-- 내용 삽입 -->
@@ -579,7 +623,6 @@
 							</div>
 							<!-- //TAB5 CONTENTS AREA -->
 						</li>
-						<!-- //TAB5 : 추가정보 -->
 					</ul>
 					<!-- //TABS CONTENTS -->
 					<!-- TABS BUTTON AREA -->