Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-01-14 2c44da15d2ed01cefdc0d9e12497ebbd0ef2c8f9

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



    
    
    
    
}