From f50963f4625215e0179c5d603693f2e1959969de Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期一, 09 十二月 2024 15:01:43 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/funingyunwei
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwCustomer.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 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 2aca96e..1ac6d72 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,6 +1,8 @@
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;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -18,7 +20,7 @@
@Data
@ApiModel("杩愮淮瀹㈡埛淇℃伅琛�")
@TableName("`yw_customer`")
-public class YwCustomer {
+public class YwCustomer extends LoginUserModel {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@@ -140,4 +142,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