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

src/main/java/com/style24/front/biz/dao/TsfDisplayDao.java

@@ -1,10 +1,18 @@
 package com.style24.front.biz.dao;
 
-import com.style24.core.support.annotation.ShopDs;
-import com.style24.persistence.domain.*;
-
 import java.util.Collection;
 
+import com.style24.core.support.annotation.ShopDs;
+import com.style24.persistence.domain.BrandGroup;
+import com.style24.persistence.domain.Cate1;
+import com.style24.persistence.domain.Cate2;
+import com.style24.persistence.domain.Cate3;
+import com.style24.persistence.domain.Cate4;
+import com.style24.persistence.domain.Cate4Srch;
+import com.style24.persistence.domain.Cate5;
+import com.style24.persistence.domain.Contents;
+import com.style24.persistence.domain.GnbTab;
+
 /**
  * 전시 Dao
  * 

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

@@ -2,7 +2,6 @@ package com.style24.persistence.domain;
 
 import com.style24.persistence.TscBaseDomain;
 
-import lombok.Builder;
 import lombok.Data;
 
 /**
@@ -13,7 +12,6 @@ import lombok.Data;
  */
 @SuppressWarnings("serial")
 @Data
-@Builder
 public class BrandGroup extends TscBaseDomain {
 
 	private String title;			// 브랜드그룹타이틀