From 6fa83d0480fe1327d4d5f8f8e7bbc6fc0a6820e4 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 22 五月 2024 18:14:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarUseBook.java | 9 +++++----
1 files changed, 5 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 218f678..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
@@ -93,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="鍙栨秷鏃堕棿")
@@ -172,4 +170,7 @@
@ApiModelProperty(value = "鐢宠浜虹數璇�")
@TableField(exist = false)
private String memberMobile;
+ @ApiModelProperty(value = "瀹℃壒璁板綍")
+ @TableField(exist = false)
+ private List<Approve> approveList;
}
--
Gitblit v1.9.3