Merge remote-tracking branch 'origin/master'

mitao

2024-07-29 fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58

 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;

}