Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-23 0381d6fdd6831eb0abdd8bdd90a4a6a7b6e9026c

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Banner.java

@@ -37,10 +37,17 @@
    @TableField("name")
    private String name;

    @ApiModelProperty(value = "1图片2视频")
    @TableField("content_type")
    private Integer contentType;

    @ApiModelProperty(value = "跳转类型（1=无跳转，2=外部链接，3=商品详情，4=秒杀商品详情，5=领券中心）")
    @TableField("jump_type")
    private Integer jumpType;

    @TableField("content_type")
    private Integer contentType;

    @ApiModelProperty(value = "跳转内容")
    @TableField("content")
    private String content;