Merge branch 'master' of ssh://120.76.84.145:20202/java/HongRuiTang into ma...

jiangqs

2023-09-01 dfe810a2108e479c4ed4f8d24dd181140afd8730

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

@@ -18,6 +18,6 @@
    @ApiModelProperty(value = "会员用户id")
    private Long memberUserId;

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