fix: resolve merge conflicts in .gitignore

mitao

2025-03-19 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec

 ruoyi-system/src/main/java/com/ruoyi/system/model/TInformation.java

@@ -59,6 +59,10 @@
    @TableField("cover")
    private String cover;

    @ApiModelProperty(value = "简介")
    @TableField("brief_introduction")
    private String briefIntroduction;

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