From 0c51ea5f39e11279ccebbad241cbb09aa74ee1a2 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 13 十二月 2024 20:03:08 +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 | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 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 8a10521..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
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -19,7 +20,7 @@
@Data
@ApiModel("鍦ㄥ巶浜哄憳淇℃伅 琛紙婊炵暀锛�")
@TableName("`retention`")
-public class Retention {
+public class Retention extends LoginUserModel {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭")
@@ -29,7 +30,6 @@
private Integer creator;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�")
@@ -62,7 +62,6 @@
private String name;
@ApiModelProperty(value = "璁垮骞撮緞")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date birthday;
@ApiModelProperty(value = "鎵嬫満鍙�")
@@ -85,7 +84,8 @@
@ApiModelProperty(value = "娴峰悍闂ㄧ鍚嶇О")
@ExcelColumn(name="杩涘巶闂ㄧ" ,index = 6,width = 12)
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