Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-18 1f7f2beb1d8a63ddfbb69181453b047ca5c7b3a0

 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;


}