productDev/dmvisit.git

			@@ -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")
			@@ -101,7 +100,6 @@

			@ApiModelProperty(value = "取消时间")
			@ExcelColumn(name="取消时间")
			@JsonFormat(pattern = "yyyy-MM-dd")
			private Date cancelTime;

			@ApiModelProperty(value = "取消人", example = "1")
			@@ -136,8 +134,8 @@
			@ExcelColumn(name="申请人编码(关联member)")
			private Integer memberId;

			@ApiModelProperty(value = "司机编码（关联car_driver）", example = "1")
			@ExcelColumn(name="司机编码（关联car_driver）")
			@ApiModelProperty(value = "司机编码（关联memberId）", example = "1")
			@ExcelColumn(name="司机编码（关联memberId）")
			private Integer driverId;

			@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;
			}