fix: resolve merge conflicts in .gitignore

mitao

2025-03-19 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec

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

@@ -51,6 +51,10 @@
    @TableField("deduction_money")
    private BigDecimal deductionMoney;

    @ApiModelProperty(value = "抵扣前欠费金额")
    @TableField("pre_outstand")
    private BigDecimal preOutstand;

    @ApiModelProperty(value = "剩余金额")
    @TableField("remaining_money")
    private BigDecimal remainingMoney;