From c8bc6fdbdc37f551388b71372c35d4f42f58e571 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 22 五月 2024 18:14:29 +0800
Subject: [PATCH] 代码初始化

---
 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarUseBook.java |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 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 36e6a6f..b9b1d62 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
@@ -62,10 +62,12 @@
 
     @ApiModelProperty(value = "寮�濮嬫椂闂�")
     @ExcelColumn(name="寮�濮嬫椂闂�")
+//    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date startTime;
 
     @ApiModelProperty(value = "缁撴潫鏃堕棿")
     @ExcelColumn(name="缁撴潫鏃堕棿")
+//    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date endTime;
 
     @ApiModelProperty(value = "棰勮鍑哄彂鏃堕棿")
@@ -91,13 +93,11 @@
 
     @ApiModelProperty(value = "鍙栨秷绫诲瀷 0鐢宠浜哄彇娑� 1娲捐溅鍛樻挙閿�")
     @ExcelColumn(name="鍙栨秷绫诲瀷 0鐢宠浜哄彇娑� 1娲捐溅鍛樻挙閿�")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date cancelType;
+    private Integer cancelType;
 
     @ApiModelProperty(value = "鏄惁宸插彇娑� 0鏈彇娑� 1宸插彇娑�")
     @ExcelColumn(name="鏄惁宸插彇娑� 0鏈彇娑� 1宸插彇娑�")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date cancelStatus;
+    private Integer cancelStatus;
 
     @ApiModelProperty(value = "鍙栨秷鏃堕棿")
     @ExcelColumn(name="鍙栨秷鏃堕棿")
@@ -164,4 +164,13 @@
     @ApiModelProperty(value = "鏌ヨ鎴濮嬫椂闂达紙鍩轰簬鍒涘缓鏃堕棿锛�", example = "2024-05-20 11:48:46")
     @TableField(exist = false)
     private Date queryEndTime;
+    @ApiModelProperty(value = "鏌ヨ鏃ユ湡", example = "2024-05-20" ,notes = "H5浣跨敤")
+    @TableField(exist = false)
+    private String queryDate;
+    @ApiModelProperty(value = "鐢宠浜虹數璇�")
+    @TableField(exist = false)
+    private String memberMobile;
+    @ApiModelProperty(value = "瀹℃壒璁板綍")
+    @TableField(exist = false)
+    private List<Approve> approveList;
 }

--
Gitblit v1.9.3