From c4aec3aa2d6c7c91b67d32ef625fe9e1f457177f Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 24 六月 2025 17:34:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
index 4c11359..3f78018 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
@@ -95,7 +95,7 @@
/**
* 鏈鏉ョエ鏁�
*/
- private Long ticketsNum;
+ private BigDecimal ticketsNum;
/**
* 鏈鏉ョエ閲戦(鍏�)
@@ -105,7 +105,7 @@
/**
* 鏈潵绁ㄦ暟
*/
- private Long futureTickets;
+ private BigDecimal futureTickets;
/**
* 鏈潵绁ㄩ噾棰�(鍏�)
@@ -113,10 +113,10 @@
private BigDecimal futureTicketsAmount;
@ApiModelProperty(value = "寮�绁ㄦ暟")
- private Integer invoiceNum;
+ private BigDecimal invoiceNum;
@ApiModelProperty(value = "鏈紑绁ㄦ暟")
- private Integer noInvoiceNum;
+ private BigDecimal noInvoiceNum;
@ApiModelProperty(value = "寮�绁ㄩ噾棰�")
private BigDecimal invoiceAmount;
@@ -126,7 +126,7 @@
@ApiModelProperty(value = "鏈寮�绁ㄦ暟")
@TableField(exist = false)
- private Integer currentInvoiceNum;
+ private BigDecimal currentInvoiceNum;
@TableField(exist = false)
@ApiModelProperty(value = "鏈寮�绁ㄩ噾棰�")
@@ -144,5 +144,27 @@
@ApiModelProperty(value = "鍒濆鏈紑绁ㄦ暟")
@TableField(exist = false)
- private Integer originalNoInvoiceNum;
+ private BigDecimal originalNoInvoiceNum;
+
+ @ApiModelProperty(value = "涓存椂鏈紑绁ㄦ暟")
+ @TableField(exist = false)
+ private BigDecimal tempNoInvoiceNum;
+
+ @ApiModelProperty(value = "涓存椂鏈紑绁ㄩ噾棰�")
+ @TableField(exist = false)
+ private BigDecimal tempnoInvoiceAmount;
+
+ @ApiModelProperty(value = "涓存椂鏈潵绁ㄦ暟")
+ @TableField(exist = false)
+ private BigDecimal tempFutureTickets;
+
+ @ApiModelProperty(value = "涓存椂鏈潵绁ㄩ噾棰�")
+ @TableField(exist = false)
+ private BigDecimal tempFutureTicketsAmount;
+
+ @ApiModelProperty("鐧昏浜�")
+ private String register;
+
+ @ApiModelProperty("鐧昏鏃ユ湡")
+ private String registerDate;
}
--
Gitblit v1.9.3