Merge remote-tracking branch 'origin/master'

puzhibing

2025-01-15 f8d94f4c0f3441c9e1e54a163d2d5395ced2ee5c

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

@@ -68,4 +68,9 @@
    @ApiModelProperty(value = "展示状态：0下架中  1上架中")
    private Integer showStatus;


    public Integer getType(){
        return goodsType;
    }

}