From 17efddc6a667670dca682bf36b51a43e99615e6d Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 16 十月 2024 15:59:38 +0800
Subject: [PATCH] 代码初始化
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarUseBook.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 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..4d0bb63 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;
@@ -22,7 +23,6 @@
@ApiModel("杞﹁締_鐢ㄨ溅鐢宠淇℃伅琛�")
@TableName("`car_use_book`")
public class CarUseBook extends LoginUserModel {
-
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@ExcelColumn(name="涓婚敭")
@@ -62,12 +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 = "棰勮鍑哄彂鏃堕棿")
@@ -80,7 +80,6 @@
@ApiModelProperty(value = "瀹℃壒鏃堕棿(鏈�杩戜竴娆★級")
@ExcelColumn(name="瀹℃壒鏃堕棿(鏈�杩戜竴娆★級")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date checkDate;
@ApiModelProperty(value = "瀹℃壒浜�(鏈�杩戜竴娆★級", example = "1")
@@ -93,17 +92,14 @@
@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="鍙栨秷鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date cancelTime;
@ApiModelProperty(value = "鍙栨秷浜�", example = "1")
@@ -138,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")
@@ -172,4 +168,7 @@
@ApiModelProperty(value = "鐢宠浜虹數璇�")
@TableField(exist = false)
private String memberMobile;
+ @ApiModelProperty(value = "瀹℃壒淇℃伅鏁版嵁")
+ @TableField(exist = false)
+ private ApproveDataVO approveDateVO;
}
--
Gitblit v1.9.3