From 43942a545271345ce26e40d82bb97138c5ea7611 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 28 六月 2024 13:54:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java | 9 +++------
1 files changed, 3 insertions(+), 6 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 31dd657..8478c38 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
@@ -84,7 +84,6 @@
private String name;
@ApiModelProperty(value = "璁垮骞撮緞")
@ExcelColumn(name="璁垮骞撮緞")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date birthday;
@ApiModelProperty(value = "鎵嬫満鍙�")
@@ -105,6 +104,9 @@
@ApiModelProperty(value = "璇佷欢绫诲瀷 0韬唤璇� 1娓境璇佷欢 2鎶ょ収", example = "1")
@ExcelColumn(name="璇佷欢绫诲瀷 0韬唤璇� 1娓境璇佷欢 2鎶ょ収")
private Integer idcardType;
+ @ApiModelProperty(value = "鏄惁鏄墿娴佸徃鏈� 0涓嶆槸 1鏄�", example = "1")
+ @ExcelColumn(name="鏄惁鏄墿娴佸徃鏈� 0涓嶆槸 1鏄�")
+ private Integer isDriver;
@ApiModelProperty(value = "宸ュ彿")
@ExcelColumn(name="宸ュ彿")
@@ -138,7 +140,6 @@
@ApiModelProperty(value = "椋炰功鏈�杩戝悓姝ユ椂闂�")
@ExcelColumn(name="椋炰功鏈�杩戝悓姝ユ椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date fsDate;
@ApiModelProperty(value = "娴峰悍鏍囪瘑", example = "1")
@@ -154,7 +155,6 @@
@ApiModelProperty(value = "娴峰悍鏈�杩戝悓姝ユ椂闂�")
@ExcelColumn(name="娴峰悍鏈�杩戝悓姝ユ椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date hkDate;
@ApiModelProperty(value = "鍦ㄨ亴鐘舵�� 0鍦ㄨ亴 1绂昏亴", example = "1")
@@ -166,7 +166,6 @@
@ApiModelProperty(value = "ERP鍚屾鏃堕棿")
@ExcelColumn(name="ERP鍚屾鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date erpDate;
@ApiModelProperty(value = "ERP鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�", example = "1")
@@ -179,7 +178,6 @@
@ApiModelProperty(value = "閽夐拤鍚屾鏃堕棿")
@ExcelColumn(name="閽夐拤鍚屾鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date ddDate;
@ApiModelProperty(value = "閽夐拤P鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�", example = "1")
@@ -204,7 +202,6 @@
@ApiModelProperty(value = "闂ㄧ瑙掕壊鎺堟潈鏃堕棿")
@ExcelColumn(name="闂ㄧ瑙掕壊鎺堟潈鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date roleDate;
@ApiModelProperty(value = "ERP缁勭粐缂栫爜")
--
Gitblit v1.9.3