Merge remote-tracking branch 'origin/master'

puzhibing

2025-01-15 f8d94f4c0f3441c9e1e54a163d2d5395ced2ee5c

 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();
    }



    
    
    
    
}