From 92eb695ac1254708feb6e740432fc5da9e1ad42b Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 08 七月 2026 15:37:12 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_山西_黎城康森商砼

---
 src/main/java/com/ruoyi/account/bean/vo/sales/SalesReturnVo.java |   64 ++++++++++++++++++++++++++++++++
 1 files changed, 64 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/account/bean/vo/sales/SalesReturnVo.java b/src/main/java/com/ruoyi/account/bean/vo/sales/SalesReturnVo.java
new file mode 100644
index 0000000..36f65c4
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/bean/vo/sales/SalesReturnVo.java
@@ -0,0 +1,64 @@
+package com.ruoyi.account.bean.vo.sales;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Data
+@Schema(name = "SalesReturnVo", description = "璐㈠姟绠$悊--閿�鍞��璐у彴璐�(杩斿洖)")
+@ExcelIgnoreUnannotated
+public class SalesReturnVo {
+
+    @Schema(description = "閫�璐у崟id")
+    private Long id;
+
+    @Excel(name = "閫�璐у崟鍙�")
+    @Schema(description = "閫�璐у崟鍙�")
+    private String returnNo;
+
+    @Schema(description = "瀹㈡埛鍚嶇О")
+    @Excel(name = "瀹㈡埛鍚嶇О")
+    private String customerName;
+
+    @Schema(description = "鍏宠仈鍙戣揣鍗曞彿")
+    @Excel(name = "鍏宠仈鍙戣揣鍗曞彿")
+    private String shippingNo;
+
+    @Schema(description = "鍙戣揣绫诲瀷")
+    @Excel(name = "鍙戣揣绫诲瀷")
+    private Integer shippingType;
+
+    @Schema(description = "鍙戣揣杞︾墝鍙�")
+    @Excel(name = "鍙戣揣杞︾墝鍙�")
+    private String truckPlateNo;
+
+    @Schema(description = "蹇�掑叕鍙�")
+    @Excel(name = "蹇�掑叕鍙�")
+    private String expressCompany;
+
+    @Schema(description = "蹇�掑崟鍙�")
+    @Excel(name = "蹇�掑崟鍙�")
+    private String expressNo;
+
+    @Schema(description = "閫�璐ф棩鏈�")
+    @Excel(name = "閫�璐ф棩鏈�")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime makeTime;
+
+    @Schema(description = "閫�娆炬�婚")
+    @Excel(name = "閫�娆炬�婚")
+    private BigDecimal refundAmount;
+
+    @Schema(description = "閫�璐у師鍥�")
+    @Excel(name = "閫�璐у師鍥�")
+    private String returnReason;
+
+    @Schema(description = "閿�鍞鍗曞彿")
+    @Excel(name = "閿�鍞鍗曞彿")
+    private String salesContractNo;
+}

--
Gitblit v1.9.3