From 49c3ba90feb4f14fb2f0c911aadeb865bb07f26f Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 01 六月 2026 13:59:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_新疆马铃薯pro' into dev_新疆马铃薯pro

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

diff --git a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
index cbca6f7..31df834 100644
--- a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
@@ -185,6 +185,8 @@
     private String paymentMethod;
     @Schema(description = "瀹℃壒鐘舵��")
     private Integer approvalStatus;
+    @Schema(description = "鏀惰揣鐘舵�� 1-寰呮敹璐� 2-鏀惰揣涓� 3-宸叉敹璐�")
+    private Integer status;
     @Schema(description = "妯℃澘鍚嶇О")
     private String templateName;
     @Schema(description = "瀹℃壒浜篿d")

--
Gitblit v1.9.3