From 0fdd0bf60b7d98d21c9b5ff95bb55f0fa6495007 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 14 八月 2026 14:20:03 +0800
Subject: [PATCH] Merge branch 'dev_business' of http://114.132.189.42:9002/r/mom-pro2-after into dev_business
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/vo/payment/ErpFinancePaymentRespVO.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/vo/payment/ErpFinancePaymentRespVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/vo/payment/ErpFinancePaymentRespVO.java
index df89465..05d7d76 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/vo/payment/ErpFinancePaymentRespVO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/vo/payment/ErpFinancePaymentRespVO.java
@@ -2,6 +2,8 @@
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.invoice.ErpPurchaseInvoiceRespVO;
+import cn.iocoder.yudao.module.system.api.storage.dto.StorageBlobRespDTO;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
@@ -24,6 +26,9 @@
@Schema(description = "浠樻鐘舵��", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Integer status;
+ @Schema(description = "宸ヤ綔娴佺紪鍙�", example = "3cc7f8e6")
+ private String processInstanceId;
+
@Schema(description = "浠樻鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime paymentTime;
@@ -36,6 +41,11 @@
private Long supplierId;
@Schema(description = "渚涘簲鍟嗗悕绉�", requiredMode = Schema.RequiredMode.REQUIRED, example = "灏忕暘鑼勫叕鍙�")
private String supplierName;
+
+ @Schema(description = "鍏宠仈鐨勬潵绁ㄧ紪鍙�", requiredMode = Schema.RequiredMode.REQUIRED, example = "25787")
+ private Long invoiceId;
+ @Schema(description = "鍏宠仈鐨勬潵绁ㄤ俊鎭�")
+ private ErpPurchaseInvoiceRespVO invoice;
@Schema(description = "浠樻璐︽埛缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "28989")
private Long accountId;
@@ -54,9 +64,12 @@
@Schema(description = "澶囨敞", example = "浣犵寽")
private String remark;
- @Schema(description = "鍒涘缓浜�", example = "鑺嬮亾")
+ @Schema(description = "闄勪欢鍒楄〃")
+ private List<StorageBlobRespDTO> attachmentList;
+
+ @Schema(description = "鍒涘缓浜�", example = "瓒呯骇绠＄悊鍛�")
private String creator;
- @Schema(description = "鍒涘缓浜哄悕绉�", example = "鑺嬮亾")
+ @Schema(description = "鍒涘缓浜哄悕绉�", example = "瓒呯骇绠＄悊鍛�")
private String creatorName;
@Schema(description = "鍒涘缓鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
--
Gitblit v1.9.3