Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-25 7405ce915a649b92c51c2120b0a60b6d599454d1

 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;


}