productDev/parkBike.git

			@@ -1,5 +1,6 @@
			package com.doumee.dao.business.model;

			import com.baomidou.mybatisplus.annotation.TableField;
			import com.doumee.core.annotation.excel.ExcelColumn;
			import io.swagger.annotations.ApiModel;
			import io.swagger.annotations.ApiModelProperty;
			@@ -9,6 +10,7 @@
			import lombok.Data;
			import com.fasterxml.jackson.annotation.JsonFormat;
			import java.util.Date;
			import java.util.List;

			/**
			* 系统行为操作记录表
			@@ -58,9 +60,12 @@
			@ExcelColumn(name="内容")
			private String content;

			@ApiModelProperty(value = "类型 ", example = "1")
			@ApiModelProperty(value = "类型 0强制还车 1骑行时长修改", example = "1")
			@ExcelColumn(name="类型 ")
			private Integer type;
			@ApiModelProperty(value = "类型集合", example = "1")
			@TableField(exist = false)
			private List<Integer> typeList;

			@ApiModelProperty(value = "关联对象编码")
			@ExcelColumn(name="关联对象编码")
			@@ -101,5 +106,22 @@
			@ApiModelProperty(value = "操作结果 0成功 1失败", example = "1")
			@ExcelColumn(name="操作结果 0成功 1失败")
			private Integer result;
			@ApiModelProperty(value = "操作原因")
			private String actReason;

			@ApiModelProperty(value = "操作备注")
			private String actInfo;

			@ApiModelProperty(value = "骑行记录对象" )
			@TableField(exist = false)
			private MemberRides ridesObj;
			@ApiModelProperty(value = "查询开始日期（包含）", example = "2023-10-01 15:12:01")
			@TableField(exist = false)
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
			private Date startDate;
			@ApiModelProperty(value = "查询截止日期（包含）", example = "2023-10-09 15:12:05")
			@TableField(exist = false)
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
			private Date endDate;

			}