解决冲突

manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/Organize.java

@@ -94,9 +94,6 @@ public class Organize implements Serializable {
 	@Convert(converter = JpaConverterListJson.class)
 	private List<String> organizeLabel;
 
-	@ApiModelProperty(value = "小组标签")
-	@Convert(converter = JpaConverterListJson.class)
-	private List<String> organizeLabel;
 
 	@Transient
 	@ApiModelProperty(value = "用户id")

manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/dto/OrganizeMemberDistributionDTO.java

@@ -7,7 +7,6 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.validation.constraints.NotNull;
 import java.sql.Timestamp;
 import java.util.List;
 

manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/OrganizeServiceImpl.java

@@ -33,10 +33,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
 
 @Service
 @RequiredArgsConstructor