From 5033c375a3ee6a63bcb600d5b9f4b8d549d089e2 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 23 四月 2026 19:09:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDtoCopy.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDtoCopy.java b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDtoCopy.java
index 0bf8547..9173ce3 100644
--- a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDtoCopy.java
+++ b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDtoCopy.java
@@ -2,7 +2,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.math.BigDecimal;
@@ -49,7 +49,7 @@
*/
private String customerName;
- private String salesLedgerProductId;
+ private Long salesLedgerProductId;
/**
* 鍑哄叆搴撴暟閲�
@@ -60,14 +60,14 @@
/**
* 鍏ュ簱鍗曚环
*/
- @ApiModelProperty(value = "鍏ュ簱鍗曚环")
+ @Schema(description = "鍏ュ簱鍗曚环")
@Excel(name = "鍏ュ簱鍗曚环")
private BigDecimal unitPrice;
/**
* 鍏ュ簱鎬讳环
*/
- @ApiModelProperty(value = "鍏ュ簱鎬讳环")
+ @Schema(description = "鍏ュ簱鎬讳环")
@Excel(name = "鍏ュ簱鎬讳环")
private BigDecimal totalPrice;
--
Gitblit v1.9.3