Merge branch 'refs/heads/jxl-yirenhebing' into test-ecs

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/KylinArtistProductFrontVo.java

@@ -14,6 +14,9 @@ public class KylinArtistProductFrontVo implements Serializable {
     @ApiModelProperty("商品SPU ID")
     private String spuId;
 
+    @ApiModelProperty("商品类型 0-常规 1-数字藏品 2-券类商品")
+    private Integer spuType;
+
     @ApiModelProperty("商品名称")
     private String name;
 

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinArtistFrontServiceImpl.java

@@ -175,6 +175,7 @@ public class KylinArtistFrontServiceImpl implements IKylinArtistFrontService {
             }
             KylinArtistProductFrontVo vo = new KylinArtistProductFrontVo();
             vo.setSpuId(goods.getSpuId());
+            vo.setSpuType(goods.getSpuType());
             vo.setName(goods.getName());
             vo.setCoverPic(goods.getCoverPic());
             vo.setSellPrice(resolveGoodsSellPrice(goods));