From cb6874174975a370cb60f1557704c9d49a05f9e6 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 05 一月 2024 08:59:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/MemberInfoDTO.java | 19 +++++++++++++++++--
1 files changed, 17 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 42563f5..2a88362 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,5 +1,6 @@
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;
@@ -50,7 +51,7 @@
@ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳")
private Integer type;
- @ApiModelProperty(value = "璁垮鍚嶇О")
+ @ApiModelProperty(value = "璁垮鍚嶇О/鍐呴儴浜哄憳鍚嶇О")
private String name;
@ApiModelProperty(value = "鎬у埆")
@@ -92,7 +93,6 @@
@ApiModelProperty(value = "鏄惁鍙嫓璁夸汉 0鍚� 1鏄�")
private String canVisit;
-
@ApiModelProperty(value = "鍗＄墖鏁�")
private Integer memberCardCount;
@@ -104,4 +104,19 @@
@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 userActionType1;
+
+ @ApiModelProperty(value = "璇佷欢绫诲瀷 0韬唤璇� 1娓境璇佷欢 2鎶ょ収", example = "1")
+ private Integer idcardType;
+
}
--
Gitblit v1.9.3