Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

puzhibing

2023-12-08 32106f511657695e79d53e98a350ce70a36f6da1

 cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/ProductDetailsVo.java

@@ -65,4 +65,7 @@
    @ApiModelProperty(value = "商品类型 1实物 2课包 3门票 4优惠券")
    private Integer goodType;

    @ApiModelProperty(value = "1日卡 2月卡 3季卡 4年卡")
    private Integer cardType;

}