Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-18 9d9832c4fc87f8da685f055da7ea7145879b4e0b

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/SeckillActivityInfo.java

@@ -73,5 +73,8 @@
    @TableField(exist = false)
    private List<GoodsSeckill> goodsSeckills;

    @TableField(exist = false)
    private Goods goods;


}