From 261f60837f9224fa1afdaf819cb33b85ff9f4d77 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期三, 29 五月 2024 11:33:14 +0800 Subject: [PATCH] 最新版本 --- server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarUseBook.java | 8 +++----- 1 files changed, 3 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 b9b1d62..49deff2 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="涓婚敭") @@ -80,7 +80,6 @@ @ApiModelProperty(value = "瀹℃壒鏃堕棿(鏈�杩戜竴娆★級") @ExcelColumn(name="瀹℃壒鏃堕棿(鏈�杩戜竴娆★級") - @JsonFormat(pattern = "yyyy-MM-dd") private Date checkDate; @ApiModelProperty(value = "瀹℃壒浜�(鏈�杩戜竴娆★級", example = "1") @@ -101,7 +100,6 @@ @ApiModelProperty(value = "鍙栨秷鏃堕棿") @ExcelColumn(name="鍙栨秷鏃堕棿") - @JsonFormat(pattern = "yyyy-MM-dd") private Date cancelTime; @ApiModelProperty(value = "鍙栨秷浜�", example = "1") @@ -170,7 +168,7 @@ @ApiModelProperty(value = "鐢宠浜虹數璇�") @TableField(exist = false) private String memberMobile; - @ApiModelProperty(value = "瀹℃壒璁板綍") + @ApiModelProperty(value = "瀹℃壒淇℃伅鏁版嵁") @TableField(exist = false) - private List<Approve> approveList; + private ApproveDataVO approveDateVO; } -- Gitblit v1.9.3