From 7d1abc56db2b67657070016c19640f815f627994 Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期四, 14 十二月 2023 17:48:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/MemberInfoDTO.java | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 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..7a66b78 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,11 +1,13 @@
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;
/**
@@ -13,7 +15,7 @@
*/
@Data
@ApiModel("鍔冲姟浜哄憳淇℃伅琛�")
-public class MemberInfoDTO {
+public class MemberInfoDTO implements Serializable {
@ApiModelProperty(value = "涓婚敭")
private Integer id;
@@ -52,6 +54,9 @@
@ApiModelProperty(value = "璁垮鍚嶇О")
private String name;
+ @ApiModelProperty(value = "鎬у埆")
+ private Integer sex;
+
@ApiModelProperty(value = "璁垮骞撮緞")
private Date birthday;
@@ -79,6 +84,19 @@
@ApiModelProperty(value = "寰俊openid")
private String openid;
+ @ApiModelProperty(value = "闂ㄧ瑙掕壊缂栫爜")
+ private Integer 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 +105,15 @@
@JsonFormat(pattern = "yyyy-MM-dd")
private Date empowerEndTime;
+ @ApiModelProperty(value = "鎷滆娆℃暟")
+ @TableField(exist = false)
+ private Integer visitsCount;
+
+ @ApiModelProperty(value = "鏈�鍚庤瀹㈡椂闂�")
+ @TableField(exist = false)
+ private Date visitsLastDate;
+
+
+
+
}
--
Gitblit v1.9.3