From 4635770544e2d57416ad88a8983ee293919f5fec Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 25 五月 2026 09:25:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java | 17 ++---------------
1 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
index 455dc9b..22faea3 100644
--- a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
@@ -27,6 +27,8 @@
private String entryDateStart;
private String entryDateEnd;
+ @Schema(description = "鍏ュ簱鐘舵��")
+ private String stockInStatus;
private Long id;
@@ -165,26 +167,11 @@
private BigDecimal invoiceAmount;
/**
- * 鏉ョエ鐧昏id
- */
- private Long ticketRegistrationId;
-
- /**
* 鍚堝悓閲戦锛堜骇鍝佸惈绋庢�讳环锛�
*/
@Excel(name = "鍚堝悓閲戦")
private BigDecimal contractAmount = BigDecimal.ZERO;
-
- @TableField(exist = false)
- @Schema(description = "鏉ョエ閲戦")
- @Excel(name = "宸叉潵绁ㄩ噾棰�(鍏�)")
- private BigDecimal receiptPaymentAmount = BigDecimal.ZERO;
-
- @Schema(description = "鏈潵绁ㄩ噾棰�")
- @TableField(exist = false)
- @Excel(name = "鏈潵绁ㄩ噾棰�(鍏�)")
- private BigDecimal unReceiptPaymentAmount =BigDecimal.ZERO;
@Schema(description = "鏂囦欢绫诲瀷 鍙� 4")
@TableField(exist = false)
--
Gitblit v1.9.3