fix: resolve merge conflicts in .gitignore

mitao

2025-03-19 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec

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

@@ -95,10 +95,10 @@
    @ApiModelProperty(value = "验收结算金额")
    @TableField("check_money")
    private BigDecimal checkMoney;
    @ApiModelProperty(value = "验收状态 待验收 已验收")
    @ApiModelProperty(value = "验收状态 0待验收 1已验收")
    @TableField("status")
    private String status;
    @ApiModelProperty(value = "验收单号")
    private Boolean status;
    @ApiModelProperty(value = "验收单号 前端忽略不传")
    @TableField("code")
    private String code;