Merge branch 'dev-wyf-v1.8.0-goblin' into test

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/manage/GoblinStoreMgtArtistTopicCreateParams.java

 package com.liquidnet.service.goblin.dto.manage;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.liquidnet.commons.lang.util.DateUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -36,10 +38,12 @@ public class GoblinStoreMgtArtistTopicCreateParams implements Serializable {
     @ApiModelProperty(value = "banner高度")
     private Integer bannerHeight;
 
-    @ApiModelProperty(value = "上架开始时间")
+    @ApiModelProperty(value = "上架开始时间[yyyy-MM-dd HH:mm:ss]")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
     private LocalDateTime onSaleStart;
 
-    @ApiModelProperty(value = "上架结束时间")
+    @ApiModelProperty(value = "上架结束时间[yyyy-MM-dd HH:mm:ss]")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
     private LocalDateTime onSaleEnd;
 
     @ApiModelProperty(value = "专题商品")

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/manage/GoblinStoreMgtArtistTopicUpdateParams.java

 package com.liquidnet.service.goblin.dto.manage;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.liquidnet.commons.lang.util.DateUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -40,10 +42,12 @@ public class GoblinStoreMgtArtistTopicUpdateParams implements Serializable {
     @ApiModelProperty(value = "banner高度")
     private Integer bannerHeight;
 
-    @ApiModelProperty(value = "上架开始时间")
+    @ApiModelProperty(value = "上架开始时间[yyyy-MM-dd HH:mm:ss]")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
     private LocalDateTime onSaleStart;
 
-    @ApiModelProperty(value = "上架结束时间")
+    @ApiModelProperty(value = "上架结束时间[yyyy-MM-dd HH:mm:ss]")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
     private LocalDateTime onSaleEnd;
 
     @ApiModelProperty(value = "专题商品，全量替换")

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

@@ -22,6 +22,9 @@ public class GoblinStoreMgtArtistTopicGoodsSearchItemVo implements Serializable
     @ApiModelProperty("封面")
     private String coverPic;
 
-    @ApiModelProperty("售价")
-    private BigDecimal sellPrice;
+    @ApiModelProperty("价格区间MIN")
+    private BigDecimal priceGe;
+
+    @ApiModelProperty("价格区间MAX")
+    private BigDecimal priceLe;
 }