Merge branch 'pre' into 'master'

~api:我的藏品详情+skuWatchPic预览图展示;

See merge request !262

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

@@ -49,6 +49,8 @@ public class GoblinUserDigitalArtworkInfoVo implements Serializable, Cloneable {
 
     @ApiModelProperty(position = 26, value = "单品ID")
     private String skuId;
+    @ApiModelProperty(position = 27, value = "展示预览图片URL[256]")
+    private String skuWatchPic;
 
     private static final GoblinUserDigitalArtworkInfoVo obj = new GoblinUserDigitalArtworkInfoVo();
 

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinUserDigitalArtworkServiceImpl.java

@@ -134,6 +134,7 @@ public class GoblinUserDigitalArtworkServiceImpl implements IGoblinUserDigitalAr
             artworkInfoVo.setArUrlIos(goodsSkuInfoVo.getArUrlIos());
             artworkInfoVo.setArUrlAndroid(goodsSkuInfoVo.getArUrlAndroid());
 //            artworkInfoVo.setGenerateTime(goodsSkuInfoVo.getDeclareAt());
+            artworkInfoVo.setSkuWatchPic(goodsSkuInfoVo.getSkuWatchPic());
 
             return artworkInfoVo;
         }