From 8bd6e0f1c84f2bc5bf2b9555d1c5fb388565db6c Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 11 十二月 2024 19:17:12 +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 | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 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 b7cc49a..9cb13d8 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,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;
@@ -119,6 +121,9 @@
@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)
@@ -137,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