From 9ed1d4ece13f1bfc21877c165ad9e9bcf7653aa3 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 23 五月 2024 18:25:19 +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 | 18 ++++++++++++++----
1 files changed, 14 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..0180d89 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
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.core.model.LoginUserModel;
+import com.doumee.dao.business.vo.ApproveDataVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -62,10 +63,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 +94,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 +165,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 ApproveDataVO approveDateVO;
}
--
Gitblit v1.9.3