From 7ff92e90d2318f5c2597c4ba01e0cbfde983cec0 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 17 六月 2026 10:13:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwCustomer.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwCustomer.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwCustomer.java
index 01f5ad9..eab0b90 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwCustomer.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwCustomer.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
@@ -67,6 +68,12 @@
@ApiModelProperty(value = "鎵嬫満鍙�")
@ExcelColumn(name="鎵嬫満鍙�")
private String phone;
+
+ @ApiModelProperty(value = "寰俊openid")
+ private String openid;
+
+ @ApiModelProperty(value = "鏄惁宸插畬鎴愰娆″厖鍊煎埗 0鍚� 1鏄�")
+ private Integer firstRechargeDone;
@ApiModelProperty(value = "韬唤璇佸彿锛堝姞瀵嗭級")
@ExcelColumn(name="韬唤璇佸彿锛堝姞瀵嗭級")
@@ -141,4 +148,20 @@
@ExcelColumn(name="鑱旂郴浜虹紪鐮侊紙鍏宠仈member锛�")
private Integer memberId;
+ @ApiModelProperty(value = "鏈夋晥鏈�")
+ @ExcelColumn(name="鏈夋晥鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date validity;
+
+ @ApiModelProperty(value = "榛樿鍛樺伐淇℃伅")
+ @TableField(exist = false)
+ private Member member;
+
+ @ApiModelProperty(value = "鍛樺伐鍚嶇О")
+ @TableField(exist = false)
+ private String memberName;
+
+ @ApiModelProperty(value = "鑱旂郴浜虹數璇�")
+ @TableField(exist = false)
+ private String memberPhone;
}
--
Gitblit v1.9.3