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 | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 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..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 @@ -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,7 +10,10 @@ 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; +import java.util.List; /** * 瀹㈡埛鐣欒祫璁板綍淇℃伅琛� @@ -137,5 +141,37 @@ @ApiModelProperty(value = "crm鎻愪氦澶囨敞") @ExcelColumn(name="crm鎻愪氦澶囨敞") private String crmInfo; + @ApiModelProperty(value = "瀵艰喘鐧诲綍鍚嶉泦鍚堬紝鑻辨枃閫楀彿闅斿紑") + @ExcelColumn(name="瀵艰喘鐧诲綍鍚嶉泦鍚堬紝鑻辨枃閫楀彿闅斿紑") + private String usernames; + + @ApiModelProperty(value = "鍖哄煙") + @ExcelColumn(name="鍖哄煙") + private String areaName; + + @ApiModelProperty(value = "鍖哄煙缂栫爜") + @ExcelColumn(name="鍖哄煙缂栫爜") + private String areaCode; + + @ApiModelProperty(value = "濮撳悕") + @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; + + @ApiModelProperty(value = "C绔敤鎴蜂富閿�") + @TableField(exist = false) + private Long memberId; + + @ApiModelProperty(value = "鏄惁鑴辨晱鎵嬫満鍙�",hidden = true) + @TableField(exist = false) + private Integer isHiddenPhone; + } -- Gitblit v1.9.3