From da00ef0e4d14467a65862cc8d5033850de6a5520 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 05 七月 2024 18:32:46 +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/CarUseBook.java | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarUseBook.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarUseBook.java
index 0180d89..48c6832 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarUseBook.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarUseBook.java
@@ -23,7 +23,6 @@
@ApiModel("杞﹁締_鐢ㄨ溅鐢宠淇℃伅琛�")
@TableName("`car_use_book`")
public class CarUseBook extends LoginUserModel {
-
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@ExcelColumn(name="涓婚敭")
@@ -81,7 +80,6 @@
@ApiModelProperty(value = "瀹℃壒鏃堕棿(鏈�杩戜竴娆★級")
@ExcelColumn(name="瀹℃壒鏃堕棿(鏈�杩戜竴娆★級")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date checkDate;
@ApiModelProperty(value = "瀹℃壒浜�(鏈�杩戜竴娆★級", example = "1")
@@ -102,7 +100,6 @@
@ApiModelProperty(value = "鍙栨秷鏃堕棿")
@ExcelColumn(name="鍙栨秷鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date cancelTime;
@ApiModelProperty(value = "鍙栨秷浜�", example = "1")
@@ -137,8 +134,8 @@
@ExcelColumn(name="鐢宠浜虹紪鐮�(鍏宠仈member)")
private Integer memberId;
- @ApiModelProperty(value = "鍙告満缂栫爜锛堝叧鑱攃ar_driver锛�", example = "1")
- @ExcelColumn(name="鍙告満缂栫爜锛堝叧鑱攃ar_driver锛�")
+ @ApiModelProperty(value = "鍙告満缂栫爜锛堝叧鑱攎emberId锛�", example = "1")
+ @ExcelColumn(name="鍙告満缂栫爜锛堝叧鑱攎emberId锛�")
private Integer driverId;
@ApiModelProperty(value = "鍙告満濮撳悕", example = "1")
--
Gitblit v1.9.3