From 16f010aadd3ceb3c51fb97c2f6def3f5944fd54c Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期五, 22 十一月 2024 15:52:40 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwCustomer.java | 13 +++++++++++++ 1 files changed, 13 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..bfbd718 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; @@ -141,4 +142,16 @@ @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; } -- Gitblit v1.9.3