From f63d3a3be83fea258e7920efccd2567b6a511bb3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 16 一月 2025 16:52:46 +0800
Subject: [PATCH] 最新版本541200007

---
 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java |   27 ++++++++++++++++++++++++---
 1 files changed, 24 insertions(+), 3 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..07466d5 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
@@ -2,7 +2,7 @@
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -83,9 +83,9 @@
 
     @ApiModelProperty(value = "娴峰悍闂ㄧ鍚嶇О")
     @ExcelColumn(name="杩涘巶闂ㄧ" ,index = 6,width = 12)
-    @TableField(exist = false)
     private String deviceName;
-
+    @ApiModelProperty(value = "杞﹁締绫诲瀷 0鍐呴儴杞﹁締 1鐩稿叧鏂硅溅杈� 2璁垮杞﹁締 3鍐呰繍鐗╂祦杞� 4澶栧崗杞﹁締 5甯傚叕鍙稿嵏璐ц溅 ")
+    private Integer carType  ;
     @ApiModelProperty(value = "娴峰悍闂ㄧ缂栫爜")
     private String deviceIndex;
 
@@ -96,6 +96,8 @@
 
     @ApiModelProperty(value = "璁垮ID(鍏宠仈member)")
     private Integer memberId;
+    @ApiModelProperty(value = "璁垮1闂ㄧ浜嬩欢2杞﹁締浜嬩欢")
+    private String accessType;
 
     @ApiModelProperty(value = "浜嬩欢绫诲瀷鐮�")
     private String eventCode;
@@ -116,6 +118,13 @@
     @TableField(exist = false)
     private String keyWords;
 
+    @ApiModelProperty(value = "绫诲瀷 0鍔冲姟鍏徃 1鍐呴儴缁勭粐")
+    @TableField(exist = false)
+    private Integer companyType;
+    @ApiModelProperty(value = "绫诲瀷 0璁垮 1鍐呴儴浜哄憳")
+    @TableField(exist = false)
+    private Integer memberType;
+
     @ApiModelProperty(value = "寮�濮嬫椂闂�")
     @TableField(exist = false)
     private Date startTime;
@@ -133,4 +142,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