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

jiangqs

2023-05-10 7a49bcc5e561df7a9b65266a57a9c0896c0fd3d0

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

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

    @ApiModelProperty(value = "商品名称")
    private String goodsName;

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