Merge remote-tracking branch 'origin/dev_voice' into dev_voice

# Conflicts:
#	epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/CorrelationTagListResultDto.java
#	epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/TagInfoResultDto.java

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

@@ -1,6 +1,8 @@
 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/result/CorrelationTagListResultDto.java

@@ -0,0 +1,27 @@
+package com.epmet.dto.result;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @CreateTime 2020/6/3 9:41
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@Data
+public class CorrelationTagListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 5536953304816455733L;
+
+    /**
+     * 标签id
+     */
+    private String tagId;
+
+    /**
+     * 标签名称
+     */
+    private String tagName;
+}

epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/TagInfoResultDto.java

@@ -0,0 +1,27 @@
+package com.epmet.dto.result;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @CreateTime 2020/6/2 9:47
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@Data
+public class TagInfoResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 4366515668545958124L;
+
+    /**
+     * 标签id
+     */
+    private String tagId;
+
+    /**
+     * 标签名称
+     */
+    private String tagName;
+}