From f68d79d0ff6658795c19c2fd473fab9ff6f0640d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 14 三月 2026 13:53:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材

---
 src/main/java/com/ruoyi/basic/pojo/Customer.java |   30 ++++++++++++++++++++++++++++++
 1 files changed, 30 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/basic/pojo/Customer.java b/src/main/java/com/ruoyi/basic/pojo/Customer.java
index 1c7898a..595dae8 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.LocalDateTime;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.*;
@@ -31,6 +32,25 @@
      */
     @Excel(name = "瀹㈡埛鍚嶇О")
     private String customerName;
+    /** 瀹㈡埛鍒嗙被锛氶浂鍞鎴凤紝杩涢攢鍟嗗鎴� */
+
+
+    /**
+     * 璺熻繘绋嬪害
+     */
+    @Excel(name = "璺熻繘绋嬪害")
+    @TableField(exist = false)
+    private String followUpLevel;
+
+    /**
+     * 璺熻繘鏃堕棿
+     */
+    @Excel(name = "璺熻繘鏃堕棿")
+    @TableField(exist = false)
+    private LocalDateTime followUpTime;
+
+    @Excel(name = "瀹㈡埛鍒嗙被")
+    private String customerType;
 
     /**
      * 绾崇◣浜鸿瘑鍒彿
@@ -85,11 +105,21 @@
     private String addressPhone;
 
     @ApiModelProperty(value = "閾惰鍩烘湰鎴�")
+    @Excel(name = "閾惰鍩烘湰鎴�")
     private String basicBankAccount;
 
     @ApiModelProperty(value = "閾惰璐﹀彿")
+    @Excel(name = "閾惰璐﹀彿")
     private String bankAccount;
 
     @ApiModelProperty(value = "寮�鎴疯鍙�")
+    @Excel(name = "寮�鎴疯鍙�")
     private String bankCode;
+
+    @ApiModelProperty("瀹滄惌琛ㄥ崟瀹炰緥ID")
+    private String formInstanceId;
+
+    @ApiModelProperty("瀹滄惌淇敼鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime formModifiedTime;
 }

--
Gitblit v1.9.3