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

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinGoodsExtagVo.java

 package com.liquidnet.service.goblin.dto.vo;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -8,6 +9,7 @@ import java.io.Serializable;
 
 @ApiModel(value = "GoblinGoodsExtagVo", description = "商品关联音乐人、艺人、IP信息")
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class GoblinGoodsExtagVo implements Serializable, Cloneable {
     private static final long serialVersionUID = 367926424789690081L;
     @ApiModelProperty(position = 10, value = "标签ID")
@@ -18,7 +20,9 @@ public class GoblinGoodsExtagVo implements Serializable, Cloneable {
     private String tagDesc;
     @ApiModelProperty(position = 13, value = "标签图片")
     private String tagPic;
-    @ApiModelProperty(position = 14, value = "排序[数值越小,排序越前]")
+    @ApiModelProperty(position = 14, value = "标签类型[1-音乐人|2-艺术家|3-品牌方|4-厂牌]")
+    private String tagType;
+    @ApiModelProperty(position = 15, value = "排序[数值越小,排序越前]")
     private Integer sort;
 
     public GoblinGoodsExtagVo setSort(Integer sort) {
@@ -41,6 +45,7 @@ public class GoblinGoodsExtagVo implements Serializable, Cloneable {
         this.setTagName(source.getTagName());
         this.setTagDesc(source.getTagDesc());
         this.setTagPic(source.getTagPic());
+        this.setTagType(source.getTagType());
         return this;
     }
 }

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinSelfTagVo.java

@@ -21,7 +21,7 @@ public class GoblinSelfTagVo implements Serializable, Cloneable {
     private String tagDesc;
     @ApiModelProperty(position = 13, value = "标签图片")
     private String tagPic;
-    @ApiModelProperty(position = 14, value = "标签类型[1-音乐人|2-艺术家|3-IP]")
+    @ApiModelProperty(position = 14, value = "标签类型[1-音乐人|2-艺术家|3-品牌方|4-厂牌]")
     private String tagType;
     @ApiModelProperty(position = 15, value = "标签所属[0-普通标签|1-专属标签]")
     private String tagBelong;

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/entity/GoblinSelfTag.java

@@ -44,7 +44,7 @@ public class GoblinSelfTag implements Serializable {
     private String tagPic;
 
     /**
-     * 标签类型[1-音乐人|2-艺术家|3-IP]
+     * 标签类型[1-音乐人|2-艺术家|3-品牌方|4-厂牌]
      */
     private String tagType;