From 8b749305a8e8c3f4bf669f6980edf2bbb7bfa9c7 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期五, 24 四月 2026 11:14:34 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/purchase/pojo/TicketRegistration.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/pojo/TicketRegistration.java b/src/main/java/com/ruoyi/purchase/pojo/TicketRegistration.java
index 7428b0b..0dcf7c6 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/TicketRegistration.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/TicketRegistration.java
@@ -3,7 +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 io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.math.BigDecimal;
@@ -26,6 +26,13 @@
*/
@TableId(value = "id", type = IdType.AUTO)
private Long id;
+
+ /**
+ * 鐘舵��
+ */
+ @Excel(name = "鐘舵��")
+ @TableField(exist = false)
+ private String statusName;
/**
* 閲囪喘鍙拌处id
@@ -133,12 +140,12 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
- @ApiModelProperty(value = "宸蹭粯娆炬�婚噾棰�")
+ @Schema(description = "宸蹭粯娆炬�婚噾棰�")
@TableField(exist = false)
@Excel(name = "宸蹭粯娆炬�婚噾棰�")
private BigDecimal paymentAmountTotal;
- @ApiModelProperty(value = "鏈粯娆炬�婚噾棰�")
+ @Schema(description = "鏈粯娆炬�婚噾棰�")
@TableField(exist = false)
@Excel(name = "鏈粯娆炬�婚噾棰�")
private BigDecimal unPaymentAmountTotal;
@@ -154,6 +161,13 @@
@TableField(exist = false)
private String supplierNameOrContractNo;
- @ApiModelProperty(value = "褰曞叆鏃堕棿")
+ @Schema(description = "褰曞叆鏃堕棿")
private LocalDate enterDate;
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
--
Gitblit v1.9.3