Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng

Pu Zhibing

2025-01-04 c8ea2d96f5b0522a09f3203ae98fe796084d2d15

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/SeckillActivityVO.java

@@ -12,7 +12,10 @@
public class SeckillActivityVO {

    @ApiModelProperty(value = "活动id")
    private Integer id;
    private String id;

    @ApiModelProperty(value = "商品id")
    private Integer goodsId;

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