From 56a0692624bad9d65feaf0b31b8c28eb698f3c9f Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 14 十一月 2024 17:48:52 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java
index 70323e1..765170e 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java
@@ -83,7 +83,6 @@
@ApiModelProperty(value = "娴峰悍闂ㄧ鍚嶇О")
@ExcelColumn(name="杩涘巶闂ㄧ" ,index = 6,width = 12)
- @TableField(exist = false)
private String deviceName;
@ApiModelProperty(value = "娴峰悍闂ㄧ缂栫爜")
@@ -96,6 +95,8 @@
@ApiModelProperty(value = "璁垮ID(鍏宠仈member)")
private Integer memberId;
+ @ApiModelProperty(value = "璁垮1闂ㄧ浜嬩欢2杞﹁締浜嬩欢")
+ private String accessType;
@ApiModelProperty(value = "浜嬩欢绫诲瀷鐮�")
private String eventCode;
@@ -116,6 +117,10 @@
@TableField(exist = false)
private String keyWords;
+ @ApiModelProperty(value = "绫诲瀷 0鍔冲姟鍏徃 1鍐呴儴缁勭粐")
+ @TableField(exist = false)
+ private Integer companyType;
+
@ApiModelProperty(value = "寮�濮嬫椂闂�")
@TableField(exist = false)
private Date startTime;
@@ -133,4 +138,16 @@
@TableField(exist = false)
public String excelCompanyName;
+
+ @ApiModelProperty(value = "浜烘暟")
+ @TableField(exist = false)
+ private Integer num;
+
+
+ @ApiModelProperty(value = "鏌ヨ浜哄憳绫诲瀷")
+ @TableField(exist = false)
+ private Integer queryUserType;
+
+
+
}
--
Gitblit v1.9.3