Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-10-09 d5d181b911b6de2935fe14249ef958344c3fbf40

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

@@ -44,7 +44,7 @@

    @ApiModelProperty(value = "公告内容")
    @TableField("notice_content")
    private Blob noticeContent;
    private String noticeContent;

    @ApiModelProperty(value = "公告状态（0正常 1关闭）")
    @TableField("status")