From d77ecba474f6044a3b4e5e54c1a485b683854d5c Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Tue, 12 May 2026 18:10:22 +0800
Subject: [PATCH] =?UTF-8?q?1.1.32=20=E7=A4=BC=E5=93=81=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/dromara/oa/crm/domain/vo/CrmGiftApplyVo.java | 12 ++++++++++++
 .../resources/mapper/oa/crm/CrmQuoteInfoMapper.xml   |  3 ++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/vo/CrmGiftApplyVo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/vo/CrmGiftApplyVo.java
index 29575906..71d14fd0 100644
--- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/vo/CrmGiftApplyVo.java
+++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/vo/CrmGiftApplyVo.java
@@ -143,6 +143,18 @@ public class CrmGiftApplyVo implements Serializable {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ExcelProperty(value = "更新时间")
+    private Date updateTime;
+
     // ==================== 子表数据 ====================
 
     /**
diff --git a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/crm/CrmQuoteInfoMapper.xml b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/crm/CrmQuoteInfoMapper.xml
index d12503ca..24d4a614 100644
--- a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/crm/CrmQuoteInfoMapper.xml
+++ b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/crm/CrmQuoteInfoMapper.xml
@@ -9,7 +9,8 @@
     <select id="selectCustomCrmQuoteInfoVoList" resultMap="CrmQuoteInfoResult">
         select t.quote_id, t.tenant_id, t.quote_code, t.quote_name, t.quote_round, t.quote_category,
         t.quote_type, t.business_direction, t.quote_dept_id, t.quote_date, t.valid_from, t.valid_days, t.valid_to,
-        t.delivery_period, t.warranty_period, t.delivery_method, t.payment_method, t.payment_detail, t.currency_type, t.tax_included_info, t.tax_rate,
+        t.delivery_period, t.warranty_period, t.delivery_method, t.payment_method, t.payment_detail, t.currency_type,
+        t.tax_included_info, t.tax_rate,
         t.total_price, t.total_before_tax,
         t.total_tax, t.total_including_tax, t.customer_id, t.customer_contact_id, t.customer_contact_name,
         t.customer_contact_phone, t.customer_contact_email,