Merge remote-tracking branch 'origin/master'

puzhibing

2024-09-26 11b7ee0737314f83cc93873663a78a3c60008e52

 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")