From 392f7a3134cb7a27a555bb1b3e2f3601c5eadde1 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期一, 27 五月 2024 15:06:08 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarUseBook.java | 5 +++-- 1 files changed, 3 insertions(+), 2 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..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; @@ -170,7 +171,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