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

无关风月

2025-08-28 cfa7d0a90e7da9b52606ab8fca364fa5bddddcd4

 cloud-server-activity/src/main/java/com/dsh/activity/entity/UserBenefitsVideos.java

@@ -18,7 +18,7 @@
    /**
     * 主键
     */
    @TableId(value = "id", type = IdType.INPUT)
    @TableId(value = "id", type = IdType.NONE)
    private Long id;
    /**
     * 用户id