Merge remote-tracking branch 'origin/develop' into order

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;			// 브랜드그룹타이틀