From 86b776e14070d7e00471b591a5325104772e7fc4 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期六, 28 三月 2026 09:58:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hxsj' into hxsj
---
src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
index 4808080..be33613 100644
--- a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
@@ -185,10 +185,15 @@
@ApiModelProperty(value = "浠樻鏂瑰紡")
private String paymentMethod;
- @ApiModelProperty("瀹℃壒鐘舵��")
- private Integer approvalStatus;
+
@ApiModelProperty(value = "妯℃澘鍚嶇О")
private String templateName;
@ApiModelProperty(value = "瀹℃壒浜篿d")
private Integer approverId;
+
+ @ApiModelProperty(value = "0-寰呭鏍革紝1-瀹℃壒涓紝2-瀹℃壒閫氳繃锛�3-瀹℃壒涓嶉�氳繃锛�4-宸查噸鏂版彁浜�")//榛樿鏄�0
+ private Integer approvalStatus;
+
+ // 瀹℃壒浜�
+ private String approveUserIds;
}
--
Gitblit v1.9.3