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

mitao

2025-03-10 9dbb6c26c81e94e8f969805b40b0e183bf306f83

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/MemberGoodsCollection.java

@@ -60,7 +60,7 @@
    @TableLogic
    private Integer delFlag;

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

}