From e83d4cecece6e8677392229e996dea22bbe2d1e9 Mon Sep 17 00:00:00 2001 From: yaowanxin <3588231647@qq.com> Date: 星期二, 24 六月 2025 18:05:47 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/java/com/ruoyi/purchase/pojo/TicketRegistration.java | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/ruoyi/purchase/pojo/TicketRegistration.java b/src/main/java/com/ruoyi/purchase/pojo/TicketRegistration.java index 41d6171..7d4f261 100644 --- a/src/main/java/com/ruoyi/purchase/pojo/TicketRegistration.java +++ b/src/main/java/com/ruoyi/purchase/pojo/TicketRegistration.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.framework.aspectj.lang.annotation.Excel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; @@ -78,6 +79,12 @@ private BigDecimal invoiceAmount; /** + * 寮�绁ㄤ汉ID + */ + @Excel(name = "寮�绁ㄤ汉") + private String issUerId; + + /** * 寮�绁ㄤ汉 */ @Excel(name = "寮�绁ㄤ汉") @@ -126,4 +133,19 @@ @TableField(fill = FieldFill.INSERT) private Long tenantId; + @ApiModelProperty(value = "宸蹭粯娆炬�婚噾棰�") + @TableField(exist = false) + private BigDecimal paymentAmountTotal; + + @ApiModelProperty(value = "鏈粯娆炬�婚噾棰�") + @TableField(exist = false) + private BigDecimal unPaymentAmountTotal; + + @TableField(exist = false) + private Boolean status; + + @TableField(exist = false) + private String issueDateStart; + @TableField(exist = false) + private String issueDateEnd; } -- Gitblit v1.9.3