Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-19 17e2f65826b3b69871e45c88238e5c7317f7ecb7

 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;


}