Merge remote-tracking branch 'origin/dev-1.0.1' into dev-1.0.1

mitao

2025-03-10 9dbb6c26c81e94e8f969805b40b0e183bf306f83

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/AuctionCollectionDTO.java

@@ -22,4 +22,7 @@
    @ApiModelProperty(value = "商品名称")
    private String goodsSkuName;

    @ApiModelProperty(value = "1是普通商品，2 团购商品，3 秒杀商品")
    private Integer type;

}