冲突解决

epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/CorrelationTagListFormDTO.java

@@ -2,7 +2,6 @@ package com.epmet.dto.form;
 
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.util.List;
 

epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/CorrelationTagListFormDto.java

@@ -1,23 +0,0 @@
-package com.epmet.dto.form;
-
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * @Author zxc
- * @CreateTime 2020/6/3 9:39
- */
-@Data
-public class CorrelationTagListFormDTO implements Serializable {
-
-    private static final long serialVersionUID = -1588825995685146967L;
-
-    /**
-     * 标签id集合
-     */
-    private List<String> tagIdList;
-
-}