From 41c983292fdd3a4291245940cecb462b839a9e62 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期五, 08 三月 2024 08:52:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/MemberInfoDTO.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/MemberInfoDTO.java b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/MemberInfoDTO.java
index 2a88362..7d74f1b 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/MemberInfoDTO.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/MemberInfoDTO.java
@@ -9,6 +9,7 @@
import java.io.Serializable;
import java.util.Date;
+import java.util.List;
/**
* @author T14
@@ -34,6 +35,9 @@
@ApiModelProperty(value = "鍏徃鍚嶇О")
private String companyName;
+
+ @ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触 3涓嶇鍚堜笅鍙戞潯浠� 4绛夊緟鍒犻櫎鏉冮檺 ", example = "1")
+ private Integer hkStatus;
@ApiModelProperty(value = "鍏徃璐熻矗浜�")
private String linkName;
@@ -85,7 +89,7 @@
private String openid;
@ApiModelProperty(value = "闂ㄧ瑙掕壊缂栫爜")
- private Integer roleId;
+ private String roleId;
@ApiModelProperty(value = "闂ㄧ瑙掕壊鍚嶇О")
private String roleName;
@@ -112,11 +116,16 @@
@TableField(exist = false)
private Date visitsLastDate;
- @ApiModelProperty(value = "鏈�鍚庡喕缁撴椂闂�")
+ @ApiModelProperty(value = "鏈�鍚庡喕缁�/鎷夐粦鏃堕棿")
@TableField(exist = false)
- private Date userActionType1;
+ private Date optTime;
@ApiModelProperty(value = "璇佷欢绫诲瀷 0韬唤璇� 1娓境璇佷欢 2鎶ょ収", example = "1")
private Integer idcardType;
+ @ApiModelProperty(value = "璁垮鍏徃鍚嶇О")
+ private String visitCompanyName;
+
+ @ApiModelProperty(value = "闂ㄧ缁勫悕绉�")
+ private List<String> roleNames;
}
--
Gitblit v1.9.3