From c2ad2126d6f8423e0a5e6e20bbb91ef6bb1cffc0 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 25 五月 2026 13:26:27 +0800
Subject: [PATCH] fix(approve): 修复审批流程为空时的异常处理
---
src/main/java/com/ruoyi/basic/pojo/Customer.java | 49 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 44 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/pojo/Customer.java b/src/main/java/com/ruoyi/basic/pojo/Customer.java
index 47901ec..513222c 100644
--- a/src/main/java/com/ruoyi/basic/pojo/Customer.java
+++ b/src/main/java/com/ruoyi/basic/pojo/Customer.java
@@ -1,12 +1,13 @@
package com.ruoyi.basic.pojo;
-import java.io.Serializable;
-import java.util.Date;
-
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
/**
* 瀹㈡埛妗ｆ瀵硅薄 customer
@@ -30,6 +31,25 @@
*/
@Excel(name = "瀹㈡埛鍚嶇О")
private String customerName;
+ /** 瀹㈡埛鍒嗙被锛氶浂鍞鎴凤紝杩涢攢鍟嗗鎴� */
+
+
+ /**
+ * 璺熻繘绋嬪害
+ */
+// @Excel(name = "璺熻繘绋嬪害")
+ @TableField(exist = false)
+ private String followUpLevel;
+
+ /**
+ * 璺熻繘鏃堕棿
+ */
+// @Excel(name = "璺熻繘鏃堕棿" , width = 30, dateFormat = "yyyy-MM-dd")
+ @TableField(exist = false)
+ private Date followUpTime;
+
+ @Excel(name = "瀹㈡埛鍒嗙被")
+ private String customerType;
/**
* 绾崇◣浜鸿瘑鍒彿
@@ -58,7 +78,7 @@
/**
* 鑱旂郴鐢佃瘽
*/
- @Excel(name = "鑱旂郴鐢佃瘽")
+ @Excel(name = "鑱旂郴鐢佃瘽",cellType = Excel.ColumnType.STRING)
private String contactPhone;
/**
@@ -82,4 +102,23 @@
@TableField(exist = false)
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(value = "鍒涘缓鐢ㄦ埛")
+// @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
--
Gitblit v1.9.3