From 9d66bfbfcda297f628e6a857e343f98422f4534a Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 22 五月 2026 09:32:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/dev_New_pro' into dev_New_pro_OA

---
 src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java |   15 ---------------
 1 files changed, 0 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..cd3b9fd 100644
--- a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
@@ -165,26 +165,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