Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-04-01 8444084e6aa11efa23287e7f82474ac22378a5c4

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

@@ -15,9 +15,9 @@
@Data
public class MerConsumerGoodsPageDto extends MerPageDto {

    @ApiModelProperty(name = "会员用户id")
    @ApiModelProperty(value = "会员用户id")
    private Long memberUserId;

    @ApiModelProperty("商品类型1周期2服务3体验")
    @ApiModelProperty(value="商品类型1周期2服务3体验")
    private Integer goodsType;
}