fix: resolve merge conflicts in .gitignore

mitao

2025-03-19 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec

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

@@ -1,9 +1,14 @@
package com.ruoyi.system.model;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -15,7 +20,7 @@
 * </p>
 *
 * @author xiaochen
 * @since 2025-01-17
 * @since 2025-01-20
 */
@Data
@EqualsAndHashCode(callSuper = false)
@@ -25,24 +30,32 @@

    private static final long serialVersionUID = 1L;

    @TableId("id")
    @TableId(value = "id", type = IdType.ASSIGN_ID)
    private String id;

    @ApiModelProperty(value = "合同id")
    @TableField("contractId")
    @TableField("contract_id")
    private String contractId;

    @ApiModelProperty(value = "递增递减 1=递增 2=递减")
    @TableField("IncreasingDecreasing")
    private Integer IncreasingDecreasing;
    @TableField("Increasing_decreasing")
    private Integer increasingDecreasing;

    @ApiModelProperty(value = "递增递减形式 1=百分比 2=金额元")
    @TableField("IncreasingDecreasingType")
    private Integer IncreasingDecreasingType;
    @TableField("Increasing_decreasing_type")
    private Integer increasingDecreasingType;

    @ApiModelProperty(value = "数值")
    @TableField("numericalValue")
    private Double numericalValue;
    @TableField("numerical_value")
    private BigDecimal numericalValue;
    @ApiModelProperty(value = "周期 单位年")
    @TableField("cycle_time")
    private Integer cycleTime;

    @ApiModelProperty(value = "递增或递减时点")
    @TableField("change_time")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime changeTime;


}