Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-04-01 8444084e6aa11efa23287e7f82474ac22378a5c4

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerSureConsumerGoodsListDto.java

@@ -13,10 +13,15 @@
@Data
public class MerSureConsumerGoodsListDto {


    @ApiModelProperty(value = "服务id")
    private String consumerGoodsId;

    @ApiModelProperty(value = "服务次数")
    private Integer serviceNum;

    @ApiModelProperty(value = "商品id")
    private String goodsId;

    @ApiModelProperty(value = "商品次数")
    private Integer goodsNum;
}