From d764a28d914571e7a6c62d85b6e81e70328ecfdb Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期六, 23 十一月 2024 17:32:51 +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/Member.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 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 c40d545..399570e 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
@@ -64,7 +64,7 @@
@ApiModelProperty(value = "绫诲瀷 0鍙告満浜哄憳 1鏅�氳瀹� 2鍐呴儴浜哄憳 3瀹㈡埛鑱旂郴浜�", example = "1")
private Integer type;
- @ApiModelProperty(value = "韬唤 0鑰佹澘 1瓒呯骇绠＄悊鍛� 2鍛樺伐", example = "1")
+ @ApiModelProperty(value = "韬唤 0鑰佹澘/瓒呯骇绠＄悊鍛� 1浜轰簨/绠＄悊鍛� 2鍛樺伐/鏅�氬憳宸�", example = "1")
@ExcelColumn(name="韬唤 0鑰佹澘 1瓒呯骇绠＄悊鍛� 2鍛樺伐")
private Integer highCheckor;
@@ -130,7 +130,8 @@
private int memberCardCount;
@ExcelColumn(name="宸ュ彿",index = 18,width = 8)
private String code;
- @ApiModelProperty(value = "璁垮骞撮緞")
+ @ApiModelProperty(value = "鐢熸棩")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date birthday;
@@ -305,4 +306,10 @@
@ApiModelProperty(value = "鏄惁鏌ヨ鍥哄畾浜哄憳锛�0=鍚︼紱1=鏄�" )
@TableField(exist = false)
private Integer querySpecial;
+
+
+ @ApiModelProperty(value = "瀹㈡埛鍚嶇О", example = "1")
+ @TableField(exist = false)
+ private String customerName;
+
}
--
Gitblit v1.9.3