java/xizang.git

			@@ -8,6 +8,7 @@
			import java.time.LocalDateTime;
			import com.baomidou.mybatisplus.annotation.TableField;
			import java.io.Serializable;
			import java.util.List;

			import com.fasterxml.jackson.annotation.JsonFormat;
			import com.ruoyi.common.core.domain.BaseModel;
			@@ -16,6 +17,8 @@
			import io.swagger.annotations.ApiModelProperty;
			import lombok.Data;
			import lombok.EqualsAndHashCode;
			import org.springframework.data.annotation.Transient;
			import springfox.documentation.annotations.ApiIgnore;

			/**
			* <p>
			@@ -49,13 +52,13 @@
			private BigDecimal payableFeesMoney;

			@ApiModelProperty(value = "应缴费日期")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
			@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
			@TableField("payable_fees_time")
			private LocalDateTime payableFeesTime;

			@ApiModelProperty(value = "缴费状态 1=未缴费 2=待确认 3=已缴费 4=已逾期")
			@ApiModelProperty(value = "缴费状态 1=未缴费 2=待确认 3=已缴费 4=已逾期 5= 已失效")
			@TableField("pay_fees_status")
			private Integer payFeesStatus;
			private String payFeesStatus;

			@ApiModelProperty(value = "缴费金额")
			@TableField("pay_fees_money")
			@@ -72,7 +75,7 @@

			@ApiModelProperty(value = "账单类型 1=租金 2=押金 3=生活费用")
			@TableField("bill_type")
			private Integer billType;
			private String billType;

			@ApiModelProperty(value = "逾期天数")
			@TableField("over_days")
			@@ -104,5 +107,19 @@
			@TableField("voucher")
			private String voucher;

			@ApiModelProperty(value = "t_bill_confirm表确认单关联ID")
			@TableField("confirm_id")
			private String confirmId;

			/**
			* 抵扣金额
			*/
			@TableField(exist = false)
			private BigDecimal deductionMoney;
			/**
			* 抵扣前欠费金额
			*/
			@TableField(exist = false)
			private BigDecimal preOutstand;

			}