Merge remote-tracking branch 'origin/master'

puzhibing

2025-01-11 f18a802137a7642473891f6886d44cf0c229efed

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

@@ -45,9 +45,6 @@
    @TableField("jump_type")
    private Integer jumpType;

    @TableField("content_type")
    private Integer contentType;

    @ApiModelProperty(value = "跳转内容")
    @TableField("content")
    private String content;
@@ -62,7 +59,6 @@

    @ApiModelProperty(value = "删除标识（0=否，1=是）")
    @TableField("del_flag")
    @TableLogic
    private Integer delFlag;

    @ApiModelProperty(value = "添加时间")