fix: resolve merge conflicts in .gitignore

mitao

2025-03-19 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec

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

@@ -88,5 +88,8 @@
    @ApiModelProperty(value = "登录密码")
    @TableField("password")
    private String password;
    @ApiModelProperty(value = "微信openid")
    @TableField("open_id")
    private String openId;

}