From 211aafe0cb765b1deb5f2ef54949d64e9b0de8c3 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 03 十二月 2025 17:56:36 +0800
Subject: [PATCH] yys1.海川开心-修改首页库存与采购数据不显示问题    2.海川开心-优化选择审批人时增加模糊查询    3.海川开心-协同办公部门改为可手动输入    4.海川开心-修改回款流水导出没数据问题

---
 src/main/java/com/ruoyi/sales/pojo/SalesQuotation.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesQuotation.java b/src/main/java/com/ruoyi/sales/pojo/SalesQuotation.java
index 72c4f00..b22e6a3 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesQuotation.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesQuotation.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -15,19 +16,24 @@
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
     @ApiModelProperty(value = "鎶ヤ环鍗曠紪鍙�")
+    @Excel(name = "鎶ヤ环鍗曠紪鍙�")
     private String quotationNo;
     @ApiModelProperty(value = "瀹㈡埛鍚嶇О")
+    @Excel(name = "瀹㈡埛鍚嶇О")
     private String customer;
 
     @ApiModelProperty(value = "涓氬姟鍛�")
+    @Excel(name = "涓氬姟鍛�")
     private String salesperson;
     @ApiModelProperty(value = "鎶ヤ环鏃ユ湡")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "鎶ヤ环鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
     private LocalDate quotationDate;
     @ApiModelProperty(value = "鏈夋晥鏈熻嚦")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "鏈夋晥鏈熻嚦", width = 30, dateFormat = "yyyy-MM-dd")
     private LocalDate validDate;
     @ApiModelProperty(value = "浠樻鏂瑰紡")
     private String paymentMethod;
@@ -36,6 +42,7 @@
     @ApiModelProperty(value = "鐘舵��")
     private String status;
     @ApiModelProperty(value = "鎶ヤ环鎬婚噾棰�")
+    @Excel(name = "鎶ヤ环閲戦")
     private Double totalAmount;
 
     @ApiModelProperty(value = "澶囨敞")

--
Gitblit v1.9.3