From e4c10a806ff29d18cdbdd182a5930316eae3fd83 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 07 四月 2026 09:29:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_新疆_大罗素马铃薯
---
src/main/java/com/ruoyi/basic/pojo/Customer.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/pojo/Customer.java b/src/main/java/com/ruoyi/basic/pojo/Customer.java
index 8a35b2b..101d72a 100644
--- a/src/main/java/com/ruoyi/basic/pojo/Customer.java
+++ b/src/main/java/com/ruoyi/basic/pojo/Customer.java
@@ -1,6 +1,7 @@
package com.ruoyi.basic.pojo;
import java.io.Serializable;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Date;
@@ -38,16 +39,16 @@
/**
* 璺熻繘绋嬪害
*/
- @Excel(name = "璺熻繘绋嬪害")
+// @Excel(name = "璺熻繘绋嬪害")
@TableField(exist = false)
private String followUpLevel;
/**
* 璺熻繘鏃堕棿
*/
- @Excel(name = "璺熻繘鏃堕棿")
+// @Excel(name = "璺熻繘鏃堕棿" , width = 30, dateFormat = "yyyy-MM-dd")
@TableField(exist = false)
- private LocalDateTime followUpTime;
+ private Date followUpTime;
@Excel(name = "瀹㈡埛鍒嗙被")
private String customerType;
@@ -79,7 +80,7 @@
/**
* 鑱旂郴鐢佃瘽
*/
- @Excel(name = "鑱旂郴鐢佃瘽")
+ @Excel(name = "鑱旂郴鐢佃瘽",cellType = Excel.ColumnType.STRING)
private String contactPhone;
/**
--
Gitblit v1.9.3