From 2cffa027595247c136a8ee95f5f745c58cb0cce5 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 09 五月 2026 13:08:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

---
 src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
index c6b1406..455dc9b 100644
--- a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
@@ -48,11 +48,11 @@
      */
     @Excel(name = "渚涘簲鍟嗗悕绉�")
     private String supplierName;
-     /**
-     * 鏄惁鐧藉悕鍗�
-     */
-    @Excel(name = "鏄惁鐧藉悕鍗�")
-    private Integer isWhite;
+//     /**
+//     * 鏄惁鐧藉悕鍗�
+//     */
+//    @Excel(name = "鏄惁鐧藉悕鍗�")
+//    private Integer isWhite;
 
     /**
      * 褰曞叆浜哄鍚峣d

--
Gitblit v1.9.3