Merge remote-tracking branch 'origin/master'

xuhy

2025-01-15 9153a858f1ae61fa29bb7a926e7d50359117cd69

 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;
    }

}