Merge remote-tracking branch 'origin/2.0' into 2.0

huliguo

2025-07-04 c5d38d650d2ac4101b1293a4f17346e7d5420076

 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;
}