From b2d360d9113b6955287108ca9e90d76a1f3c1419 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期日, 29 九月 2024 15:05:11 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia

---
 server/service/src/main/java/com/doumee/dao/business/model/CustomerLog.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/dao/business/model/CustomerLog.java b/server/service/src/main/java/com/doumee/dao/business/model/CustomerLog.java
index 554ca9b..6df7440 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/CustomerLog.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/CustomerLog.java
@@ -13,6 +13,7 @@
 import org.apache.xpath.operations.Bool;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 瀹㈡埛鐣欒祫璁板綍淇℃伅琛�
@@ -140,6 +141,9 @@
     @ApiModelProperty(value = "crm鎻愪氦澶囨敞")
     @ExcelColumn(name="crm鎻愪氦澶囨敞")
     private String crmInfo;
+    @ApiModelProperty(value = "瀵艰喘鐧诲綍鍚嶉泦鍚堬紝鑻辨枃閫楀彿闅斿紑")
+    @ExcelColumn(name="瀵艰喘鐧诲綍鍚嶉泦鍚堬紝鑻辨枃閫楀彿闅斿紑")
+    private String usernames;
 
     @ApiModelProperty(value = "鍖哄煙")
     @ExcelColumn(name="鍖哄煙")
@@ -153,6 +157,10 @@
     @ExcelColumn(name="濮撳悕")
     private String name;
 
+    @ApiModelProperty(value = "member鐢ㄦ埛鍚嶇О",hidden = true)
+    @TableField(exist = false)
+    private String memberName;
+
     @ApiModelProperty(value = "openid")
     @TableField(exist = false)
     private String openid;
@@ -165,4 +173,5 @@
     @TableField(exist = false)
     private Integer isHiddenPhone;
 
+
 }

--
Gitblit v1.9.3