From 8d48f2f55453635bf60e5e00d1e4746288e9da67 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 22 七月 2024 15:36:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/dao/business/model/CustomerLog.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 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 d56661d..554ca9b 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
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.dao.business.dto.BaseQueryDto;
import io.swagger.annotations.ApiModel;
@@ -9,6 +10,8 @@
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.xpath.operations.Bool;
+
import java.util.Date;
/**
@@ -138,4 +141,28 @@
@ExcelColumn(name="crm鎻愪氦澶囨敞")
private String crmInfo;
+ @ApiModelProperty(value = "鍖哄煙")
+ @ExcelColumn(name="鍖哄煙")
+ private String areaName;
+
+ @ApiModelProperty(value = "鍖哄煙缂栫爜")
+ @ExcelColumn(name="鍖哄煙缂栫爜")
+ private String areaCode;
+
+ @ApiModelProperty(value = "濮撳悕")
+ @ExcelColumn(name="濮撳悕")
+ private String name;
+
+ @ApiModelProperty(value = "openid")
+ @TableField(exist = false)
+ private String openid;
+
+ @ApiModelProperty(value = "C绔敤鎴蜂富閿�")
+ @TableField(exist = false)
+ private Long memberId;
+
+ @ApiModelProperty(value = "鏄惁鑴辨晱鎵嬫満鍙�",hidden = true)
+ @TableField(exist = false)
+ private Integer isHiddenPhone;
+
}
--
Gitblit v1.9.3