Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master

jiangqs

2023-07-26 0b806dd3c5159d8fac767cf027b0301e583d1161

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

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

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