Merge remote-tracking branch 'origin/2.0' into 2.0

puzhibing

2024-03-04 135aeb3706b445d6d1a937168a0fe781cf3060a8

 cloud-server-activity/src/main/java/com/dsh/activity/mapper/BenefitsVideoClassificationMapper.java

@@ -15,5 +15,5 @@
public interface BenefitsVideoClassificationMapper extends BaseMapper<BenefitsVideoClassification> {
    List<TQueryBenefitsVO> listAll(@Param("query") QueryBenefitsVedioVO vo);

    Object changeState(@Param("ids") List<Integer> ids,@Param("type") Integer state);
    Object changeState(@Param("ids") List<Integer> ids, @Param("type") Integer state);
}