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/sales/SalesOutboundVo.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/account/bean/vo/SalesOutboundVo.java b/src/main/java/com/ruoyi/account/bean/vo/sales/SalesOutboundVo.java
similarity index 88%
rename from src/main/java/com/ruoyi/account/bean/vo/SalesOutboundVo.java
rename to src/main/java/com/ruoyi/account/bean/vo/sales/SalesOutboundVo.java
index 5ccdb5b..13c1b27 100644
--- a/src/main/java/com/ruoyi/account/bean/vo/SalesOutboundVo.java
+++ b/src/main/java/com/ruoyi/account/bean/vo/sales/SalesOutboundVo.java
@@ -1,4 +1,4 @@
-package com.ruoyi.account.bean.vo;
+package com.ruoyi.account.bean.vo.sales;
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 = "SalesOutboundVo", description = "璐㈠姟绠＄悊--閿�鍞嚭搴撳彴璐�(杩斿洖)")
@@ -28,7 +28,7 @@
@Schema(description = "鍑哄簱鏃ユ湡")
@Excel(name = "鍑哄簱鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
- private Date shippingDate;
+ private LocalDate shippingDate;
@Schema(description = "浜у搧鍚嶇О")
@Excel(name = "浜у搧鍚嶇О")
@@ -42,6 +42,9 @@
@Excel(name = "閲戦")
private BigDecimal outboundAmount;
+ @Schema(description = "绋庣巼")
+ private BigDecimal taxRate;
+
@Schema(description = "鍙戣揣缂栧彿")
@Excel(name = "鍙戣揣缂栧彿")
private String shippingNo;
--
Gitblit v1.9.3