From 9ed1d4ece13f1bfc21877c165ad9e9bcf7653aa3 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 23 五月 2024 18:25:19 +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/Member.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
index e559e1c..31dd657 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
@@ -76,7 +76,7 @@
private String imgurl;
@ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳", example = "1")
- @ExcelColumn(name="绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳")
+ @ExcelColumn(name="绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳")
private Integer type;
@ApiModelProperty(value = "璁垮鍚嶇О/鍐呴儴浜哄憳")
@@ -297,6 +297,12 @@
@ApiModelProperty(value = "闂ㄧ瑙掕壊鍚嶇О")
@TableField(exist = false)
private String roleName;
+ @ApiModelProperty(value = "鍩硅寮�濮嬫椂闂�")
+ @TableField(exist = false)
+ private Date trainStartTime;
+ @ApiModelProperty(value = "鍩硅缁撴潫鏃堕棿")
+ @TableField(exist = false)
+ private Date trainEndTime;
@ApiModelProperty(value = "闂ㄧ缁勫悕绉伴泦鍚�")
@TableField(exist = false)
--
Gitblit v1.9.3