From 2d03ec79e1892248b520cf097e8a58dd82a4892f Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 22 五月 2026 15:19:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印
---
src/main/java/com/ruoyi/basic/pojo/CustomerPrivate.java | 38 ++++++++++++++++++++++++++++----------
1 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/pojo/CustomerPrivate.java b/src/main/java/com/ruoyi/basic/pojo/CustomerPrivate.java
index 85f49a5..1971afa 100644
--- a/src/main/java/com/ruoyi/basic/pojo/CustomerPrivate.java
+++ b/src/main/java/com/ruoyi/basic/pojo/CustomerPrivate.java
@@ -1,20 +1,16 @@
package com.ruoyi.basic.pojo;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.time.LocalDate;
-import java.util.Date;
-
+import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
/**
* <p>
@@ -88,6 +84,28 @@
@Excel(name = "瀹㈡埛鍒嗙被")
private String customerType;
+
+ @ApiModelProperty(value = "娉曚汉")
+ @Excel(name = "娉曚汉")
+ @TableField(value = "corporation")
+ private String corporation;
+
+ @ApiModelProperty(value = "浼犵湡")
+ @Excel(name = "浼犵湡")
+ @TableField(value = "fax")
+ private String fax;
+
+ @ApiModelProperty(value = "寮�鎴疯")
+ @Excel(name = "寮�鎴疯")
+ @TableField(value = "bank_name")
+ private String bankName;
+
+ @ApiModelProperty(value = "浠ｇ悊")
+ @Excel(name = "浠ｇ悊")
+ @TableField(value = "agent")
+ private String agent;
+
+
@ApiModelProperty("鍒涘缓浜篒D")
@TableField(fill = FieldFill.INSERT)
private Long createUser;
@@ -103,7 +121,7 @@
@ApiModelProperty("璺熻繘鏃堕棿")
@TableField(exist = false)
- private Date followUpTime;
+ private LocalDateTime followUpTime;
@TableField(exist = false)
--
Gitblit v1.9.3