Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-01-14 694920de674526cf13afacac9f5e801e12473d41

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SeckillActivityInfoController.java

@@ -195,8 +195,9 @@
                .set(SeckillActivityInfo::getIsShelves, seckillActivityVO.getShowStatus()));
        return R.ok();
    }



    
    
    
    
}