From 68ae0e6a2dc077d8b85187ee3dbee4b87a6c9b90 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 21 三月 2024 18:02:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/MemberInfoDTO.java | 45 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 43 insertions(+), 2 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 8169aee..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
@@ -1,19 +1,22 @@
package com.doumee.dao.admin.response;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.io.Serializable;
import java.util.Date;
+import java.util.List;
/**
* @author T14
*/
@Data
@ApiModel("鍔冲姟浜哄憳淇℃伅琛�")
-public class MemberInfoDTO {
+public class MemberInfoDTO implements Serializable {
@ApiModelProperty(value = "涓婚敭")
private Integer id;
@@ -33,6 +36,9 @@
@ApiModelProperty(value = "鍏徃鍚嶇О")
private String companyName;
+ @ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触 3涓嶇鍚堜笅鍙戞潯浠� 4绛夊緟鍒犻櫎鏉冮檺 ", example = "1")
+ private Integer hkStatus;
+
@ApiModelProperty(value = "鍏徃璐熻矗浜�")
private String linkName;
@@ -49,8 +55,11 @@
@ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳")
private Integer type;
- @ApiModelProperty(value = "璁垮鍚嶇О")
+ @ApiModelProperty(value = "璁垮鍚嶇О/鍐呴儴浜哄憳鍚嶇О")
private String name;
+
+ @ApiModelProperty(value = "鎬у埆")
+ private Integer sex;
@ApiModelProperty(value = "璁垮骞撮緞")
private Date birthday;
@@ -79,6 +88,18 @@
@ApiModelProperty(value = "寰俊openid")
private String openid;
+ @ApiModelProperty(value = "闂ㄧ瑙掕壊缂栫爜")
+ private String roleId;
+
+ @ApiModelProperty(value = "闂ㄧ瑙掕壊鍚嶇О")
+ private String roleName;
+
+ @ApiModelProperty(value = "鏄惁鍙嫓璁夸汉 0鍚� 1鏄�")
+ private String canVisit;
+
+ @ApiModelProperty(value = "鍗＄墖鏁�")
+ private Integer memberCardCount;
+
@ApiModelProperty(value = "鍩硅鏈夋晥鏈熺粨鏉熸椂闂�")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date trainTimeEndTime;
@@ -87,4 +108,24 @@
@JsonFormat(pattern = "yyyy-MM-dd")
private Date empowerEndTime;
+ @ApiModelProperty(value = "鎷滆娆℃暟")
+ @TableField(exist = false)
+ private Integer visitsCount;
+
+ @ApiModelProperty(value = "鏈�鍚庤瀹㈡椂闂�")
+ @TableField(exist = false)
+ private Date visitsLastDate;
+
+ @ApiModelProperty(value = "鏈�鍚庡喕缁�/鎷夐粦鏃堕棿")
+ @TableField(exist = false)
+ 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