fix: resolve merge conflicts in .gitignore

mitao

2025-03-19 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec

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

New file
@@ -0,0 +1,88 @@
package com.ruoyi.system.model;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableId;

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

import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

/**
 * <p>
 * 流水管理
 * </p>
 *
 * @author xiaochen
 * @since 2025-01-20
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_flow_management")
@ApiModel(value="TFlowManagement对象", description="流水管理")
public class TFlowManagement extends BaseModel {

    private static final long serialVersionUID = 1L;

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

    @ApiModelProperty(value = "系统流水号")
    @TableField("sys_serial_number")
    private String sysSerialNumber;

    @ApiModelProperty(value = "银行流水号")
    @TableField("bank_serial_number")
    private String bankSerialNumber;

    @ApiModelProperty(value = "流水金额")
    @TableField("flow_money")
    private BigDecimal flowMoney;

    @ApiModelProperty(value = "抵扣金额")
    @TableField("deduction_money")
    private BigDecimal deductionMoney;

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

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

    @ApiModelProperty(value = "支付时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField("pay_time")
    private LocalDateTime payTime;

    @ApiModelProperty(value = "付款人")
    @TableField("payer")
    private String payer;

    @ApiModelProperty(value = "流水状态 1=正常 2=异常")
    @TableField("flow_status")
    private Integer flowStatus;

    @ApiModelProperty(value = "流水类型 1=系统 2=银行")
    @TableField("flow_type")
    private Integer flowType;

    @ApiModelProperty(value = "支付方式 1=微信支付 2=支付宝支付 3=线下支付")
    @TableField("pay_type")
    private Integer payType;

    @ApiModelProperty(value = "缴费账单id")
    @TableField("payment_bill_id")
    private String paymentBillId;


}