From 9d66bfbfcda297f628e6a857e343f98422f4534a Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 22 五月 2026 09:32:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/dev_New_pro' into dev_New_pro_OA
---
src/main/java/com/ruoyi/account/bean/vo/purchase/PurchaseInboundVo.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/account/bean/vo/PurchaseInboundVo.java b/src/main/java/com/ruoyi/account/bean/vo/purchase/PurchaseInboundVo.java
similarity index 92%
rename from src/main/java/com/ruoyi/account/bean/vo/PurchaseInboundVo.java
rename to src/main/java/com/ruoyi/account/bean/vo/purchase/PurchaseInboundVo.java
index 934502a..48831e1 100644
--- a/src/main/java/com/ruoyi/account/bean/vo/PurchaseInboundVo.java
+++ b/src/main/java/com/ruoyi/account/bean/vo/purchase/PurchaseInboundVo.java
@@ -1,4 +1,4 @@
-package com.ruoyi.account.bean.vo;
+package com.ruoyi.account.bean.vo.purchase;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -7,7 +7,7 @@
import lombok.Data;
import java.math.BigDecimal;
-import java.util.Date;
+import java.time.LocalDate;
@Data
@Schema(name = "PurchaseInboundVo", description = "璐㈠姟绠＄悊--閲囪喘鍏ュ簱鍙拌处(杩斿洖)")
@@ -28,7 +28,7 @@
@Schema(description = "鍏ュ簱鏃ユ湡")
@Excel(name = "鍏ュ簱鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
- private Date InboundDate;
+ private LocalDate InboundDate;
@Schema(description = "浜у搧鍚嶇О")
@Excel(name = "浜у搧鍚嶇О")
--
Gitblit v1.9.3