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/GoblinGoodsInfoDetailVo.java

@@ -43,6 +43,8 @@ public class GoblinGoodsInfoDetailVo implements Serializable, Cloneable {
     @ApiModelProperty(position = 17, value = "价格区间MAX[20,2]")
     private BigDecimal priceLe;
 
+    @ApiModelProperty(position = 60, value = "活动Id")
+    private String marketId;
     private static final GoblinGoodsInfoDetailVo obj = new GoblinGoodsInfoDetailVo();
 
     public static GoblinGoodsInfoDetailVo getNew() {