Merge remote-tracking branch 'origin/master'

puzhibing

2023-07-14 c81d766cd91be3b3a24c8db94dcd93c071a66c62

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

@@ -31,8 +31,8 @@
    @ApiModelProperty(value = "每人限额")
    private Integer perLimit;

    @ApiModelProperty(value = "积分")
    private Integer integral;
    @ApiModelProperty(value = "所需类型（积分/积分+现金）")
    private String requiredType;

    @ApiModelProperty(value = "价值")
    private BigDecimal cost;