From 1fd5eac12e532a9906e0c1d57676c692c68d1f32 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期二, 20 五月 2025 17:46:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/purchase/pojo/TicketRegistration.java | 46 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 36 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/pojo/TicketRegistration.java b/src/main/java/com/ruoyi/purchase/pojo/TicketRegistration.java
index 1452949..41d6171 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/TicketRegistration.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/TicketRegistration.java
@@ -1,12 +1,13 @@
package com.ruoyi.purchase.pojo;
-import java.math.BigDecimal;
-import java.util.Date;
-
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.Date;
/**
* 鏉ョエ鐧昏瀵硅薄 ticket_registration
@@ -53,16 +54,41 @@
*/
private String customerName;
- /**
- * 涓氬姟鍛�
- */
- @Excel(name = "涓氬姟鍛�")
- private String businessPerson;
+// /**
+// * 涓氬姟鍛�
+// */
+// @Excel(name = "涓氬姟鍛�")
+// private String businessPerson;
+//
+// /**
+// * 涓氬姟鍛榠d
+// */
+// private Long businessPersonId;
/**
- * 涓氬姟鍛榠d
+ * 鍙戠エ鍙�
*/
- private Long businessPersonId;
+ @Excel(name = "鍙戠エ鍙�")
+ private String invoiceNumber;
+
+ /**
+ * 鍙戠エ閲戦锛堝厓锛�
+ */
+ @Excel(name = "鍙戠エ閲戦(鍏�)")
+ private BigDecimal invoiceAmount;
+
+ /**
+ * 寮�绁ㄤ汉
+ */
+ @Excel(name = "寮�绁ㄤ汉")
+ private String issUer;
+
+ /**
+ * 寮�绁ㄦ棩鏈�
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd" ,timezone = "GMT+8")
+ @Excel(name = "寮�绁ㄦ棩鏈�", width = 30, dateFormat = "yyyy-MM-dd")
+ private LocalDate issueDate;
/**
* 椤圭洰鍚嶇О
--
Gitblit v1.9.3