fix: resolve merge conflicts in .gitignore

mitao

2025-03-19 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec

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

@@ -48,6 +48,9 @@
    @ApiModelProperty(value = "数值")
    @TableField("numerical_value")
    private BigDecimal numericalValue;
    @ApiModelProperty(value = "周期 单位年")
    @TableField("cycle_time")
    private Integer cycleTime;

    @ApiModelProperty(value = "递增或递减时点")
    @TableField("change_time")