From 1ca5584d7e3200a9af65a099bd26d3593e2ba702 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 07 五月 2026 14:36:08 +0800
Subject: [PATCH] 迁移pro
---
src/main/java/com/ruoyi/purchase/dto/ProcurementBusinessSummaryDto.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/dto/ProcurementBusinessSummaryDto.java b/src/main/java/com/ruoyi/purchase/dto/ProcurementBusinessSummaryDto.java
index a154c94..3e48e79 100644
--- a/src/main/java/com/ruoyi/purchase/dto/ProcurementBusinessSummaryDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/ProcurementBusinessSummaryDto.java
@@ -8,8 +8,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.purchase.pojo.PurchaseLedger;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -21,7 +20,7 @@
* @date : 2026/1/15 13:34
*/
@Data
-@ApiModel
+@Schema
public class ProcurementBusinessSummaryDto {
@Excel(name = "浜у搧澶х被")
@@ -33,12 +32,12 @@
@Excel(name = "瑙勬牸鍨嬪彿")
private String specificationModel;
- @ApiModelProperty(value = "寮�濮嬫椂闂�")
+ @Schema(description = "寮�濮嬫椂闂�")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date entryDateStart;
- @ApiModelProperty(value = "缁撴潫鏃堕棿")
+ @Schema(description = "缁撴潫鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date entryDateEnd;
@@ -82,4 +81,16 @@
@Excel(name = "褰曞叆鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
private Date entryDate;
+ /**
+ * 閫�璐ф暟閲�
+ */
+ @Excel(name = "閫�璐ф暟閲�")
+
+ private BigDecimal returnQuantity;
+
+ /**
+ * 閫�璐ч噾棰�
+ */
+ @Excel(name = "閫�璐ч噾棰�")
+ private BigDecimal returnAmount;
}
--
Gitblit v1.9.3