Merge remote-tracking branch 'origin/master'

xuhy

2025-01-15 d5bf846770b001cac64ca27a3fe2886a9c5076b3

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

}