From 81906f3e78bb07425e5c4324423ca88253d889ac Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 23 五月 2026 13:33:30 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_山西坤源化工
---
src/main/java/com/ruoyi/account/bean/dto/purchase/PurchaseInboundDto.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/account/bean/dto/PurchaseInboundDto.java b/src/main/java/com/ruoyi/account/bean/dto/purchase/PurchaseInboundDto.java
similarity index 64%
rename from src/main/java/com/ruoyi/account/bean/dto/PurchaseInboundDto.java
rename to src/main/java/com/ruoyi/account/bean/dto/purchase/PurchaseInboundDto.java
index 6ca07a4..cec0719 100644
--- a/src/main/java/com/ruoyi/account/bean/dto/PurchaseInboundDto.java
+++ b/src/main/java/com/ruoyi/account/bean/dto/purchase/PurchaseInboundDto.java
@@ -1,10 +1,11 @@
-package com.ruoyi.account.bean.dto;
+package com.ruoyi.account.bean.dto.purchase;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
-import java.util.Date;
+import java.time.LocalDate;
@Data
@Schema(name = "PurchaseInboundDto", description = "璐㈠姟绠＄悊--閲囪喘鍏ュ簱鍙拌处(浼犲弬)")
@@ -13,14 +14,18 @@
@Schema(description = "鍏ュ簱鍗曞彿")
private String inboundBatches;
+ private Long supplierId;
+
@Schema(description = "渚涘簲鍟�")
private String supplierName;
@Schema(description = "寮�濮嬫棩鏈�")
@JsonFormat(pattern = "yyyy-MM-dd")
- private Date startDate;
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate startDate;
@Schema(description = "缁撴潫鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
- private Date endDate;
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate endDate;
}
--
Gitblit v1.9.3