From 092a458a32d81bdbdc2dbea05826317c74874faf Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 11 六月 2024 11:44:40 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarDriver.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarDriver.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarDriver.java
index 697a993..de60b29 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarDriver.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarDriver.java
@@ -33,7 +33,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�")
@@ -42,7 +41,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -68,10 +66,19 @@
@ApiModelProperty(value = "浜哄憳缂栫爜锛堝叧鑱攎ember琛�)", example = "1")
@ExcelColumn(name="浜哄憳缂栫爜锛堝叧鑱攎ember琛�)")
private Integer memberId;
+ @ApiModelProperty(value = "杞﹁締缂栫爜锛堝叧鑱攃ars)", example = "1")
+ @ExcelColumn(name="杞﹁締缂栫爜锛堝叧鑱攃ars)")
+ private Integer carId;
@ApiModelProperty(value = "鍙告満濮撳悕", example = "1")
@TableField(exist = false)
private String memberName;
+ @ApiModelProperty(value = "杞︾墝鍙�", example = "1")
+ @TableField(exist = false)
+ private String carCode;
+ @ApiModelProperty(value = "鍙告満鎬у埆 1鐢� 2濂�", example = "1")
+ @TableField(exist = false)
+ private Integer memberSex;
@ApiModelProperty(value = "鍙告満缁勭粐鍚嶇О", example = "1")
@TableField(exist = false)
private String companyName;
--
Gitblit v1.9.3