From 48c6db93631b1916f9bb0f70f82fda2b50ecdc43 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期六, 25 四月 2026 11:25:09 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerImportDto.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerImportDto.java b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerImportDto.java
index f915051..bf510b4 100644
--- a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerImportDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerImportDto.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.util.Date;
@@ -35,16 +35,16 @@
@Excel(name = "澶囨敞")
private String remarks;
- @ApiModelProperty(value = "绛捐鏃ユ湡")
+ @Schema(description = "绛捐鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "绛捐鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
private Date executionDate;
- @ApiModelProperty(value = "浠樻鏂瑰紡")
+ @Schema(description = "浠樻鏂瑰紡")
@Excel(name = "浠樻鏂瑰紡")
private String paymentMethod;
- @ApiModelProperty(value = "瀹℃牳浜�(澶氫釜鐢紝闅斿紑)")
+ @Schema(description = "瀹℃牳浜�(澶氫釜鐢紝闅斿紑)")
@Excel(name = "瀹℃牳浜�(澶氫釜鐢紝闅斿紑)")
private String approveUserIds;
--
Gitblit v1.9.3