From 1b6ccb5ac0edeb3c7f2ca9035c87b6ec24209c2f Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期三, 22 四月 2026 14:35:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印
---
src/main/java/com/ruoyi/basic/pojo/Customer.java | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/pojo/Customer.java b/src/main/java/com/ruoyi/basic/pojo/Customer.java
index 2d91424..02c7636 100644
--- a/src/main/java/com/ruoyi/basic/pojo/Customer.java
+++ b/src/main/java/com/ruoyi/basic/pojo/Customer.java
@@ -1,14 +1,14 @@
package com.ruoyi.basic.pojo;
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
/**
* 瀹㈡埛妗ｆ瀵硅薄 customer
@@ -45,7 +45,7 @@
/**
* 璺熻繘鏃堕棿
*/
- @Excel(name = "璺熻繘鏃堕棿")
+// @Excel(name = "璺熻繘鏃堕棿" , width = 30, dateFormat = "yyyy-MM-dd")
@TableField(exist = false)
private LocalDateTime followUpTime;
@@ -135,4 +135,16 @@
@Excel(name = "浠ｇ悊")
@TableField(value = "agent")
private String agent;
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Long createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
+ @ApiModelProperty(value = "浣跨敤鐢ㄦ埛")
+ private Long usageUser;
+ @ApiModelProperty(value = "浣跨敤鐘舵��")
+ private Long usageStatus;
+
}
--
Gitblit v1.9.3