productDev/gtzxinglijicun.git

			@@ -35,7 +35,7 @@
			private Integer createUser;

			@ApiModelProperty(value = "创建时间")
			@ExcelColumn(name = "创建时间", index = 1, width = 16, dateFormat = "yyyy-MM-dd HH:mm:ss")
			@ExcelColumn(name = "创建时间", index = 7, width = 18, dateFormat = "yyyy-MM-dd HH:mm:ss")
			private Date createTime;

			@ApiModelProperty(value = "更新人编码", example = "1")
			@@ -49,19 +49,23 @@
			private String remark;

			@ApiModelProperty(value = "姓名")
			@ExcelColumn(name = "姓名", index = 2, width = 10)
			@ExcelColumn(name = "司机姓名", index = 1, width = 10)
			private String name;

			@ApiModelProperty(value = "手机号")
			@ExcelColumn(name = "手机号", index = 3, width = 12)
			private String telephone;

			@ApiModelProperty(value = "性别：1=男；2=女", example = "1")
			@TableField(exist = false)
			@ExcelColumn(name = "性别", index = 2, width = 6, valueMapping = "1=男；2=女")
			private Integer gender;

			@ApiModelProperty(value = "身份证号码")
			@ExcelColumn(name = "身份证号码", index = 4, width = 18)
			private String idcard;

			@ApiModelProperty(value = "婚姻状态：0=未婚；1=已婚；2=离异；3=丧偶", example = "0")
			@ExcelColumn(name = "婚姻状态", index = 5, width = 10, valueMapping = "0=未婚;1=已婚;2=离异;3=丧偶;")
			private Integer maritalStatus;

			@ApiModelProperty(value = "区划主键", example = "1")
			@@ -77,7 +81,7 @@
			private Integer carType;

			@ApiModelProperty(value = "车牌号")
			@ExcelColumn(name = "车牌号", index = 6, width = 10)
			@ExcelColumn(name = "车牌号", index = 6, width = 12)
			private String carCode;

			@ApiModelProperty(value = "车辆颜色")
			@@ -91,9 +95,13 @@
			@JsonFormat(pattern = "yyyy-MM-dd")
			private Date cardEndDate;

			@ApiModelProperty(value = "司机状态：0=注册；1=待审批；2=审批通过；3=审批驳回", example = "0")
			@ExcelColumn(name = "状态", index = 7, width = 10, valueMapping = "0=注册;1=待审批;2=审批通过;3=审批驳回;")
			@ApiModelProperty(value = "司机状态：0=启用；1=禁用；", example = "0")
			@ExcelColumn(name = "状态", index = 8, width = 8, valueMapping = "0=启用；1=禁用；")
			private Integer status;

			@ApiModelProperty(value = "审批状态：0=待审批；1=审批通过；2=审批驳回", example = "0")
			@ExcelColumn(name = "审批状态", index = 9, width = 10, valueMapping = "0=待审批；1=审批通过；2=审批驳回")
			private Integer auditStatus;

			@ApiModelProperty(value = "OPENID(APP)")
			private String openid;
			@@ -120,6 +128,9 @@
			@ApiModelProperty(value = "身份证反面照")
			private String idcardImgBack;

			@ApiModelProperty(value = "司机定级：( 5 - 1 S A B C D )", example = "1")
			private Integer driverLevel;

			@ApiModelProperty(value = "车辆照片列表")
			@TableField(exist = false)
			private List<Multifile> carImgList = new ArrayList<>();
			@@ -140,6 +151,31 @@
			@TableField(exist = false)
			private String carTypeName;

			@TableField(exist = false)
			@ApiModelProperty(value = "状态列表(查询用)", example = "0,1,2")
			private List<Integer> statusList;

			@TableField(exist = false)
			@ApiModelProperty(value = "当前余额(单位:分)", example = "10000")
			@ExcelColumn(name = "账户余额", index = 5, width = 12)
			private Long memberAmount;

			@TableField(exist = false)
			@ApiModelProperty(value = "图片前缀地址")
			private String imgPrefix;

			@TableField(exist = false)
			@ApiModelProperty(value = "查询关键字（司机姓名/手机号）")
			private String keyword;

			@TableField(exist = false)
			@ApiModelProperty(value = "创建开始日期")
			@JsonFormat(pattern = "yyyy-MM-dd")
			private Date createTimeStart;

			@TableField(exist = false)
			@ApiModelProperty(value = "创建结束日期")
			@JsonFormat(pattern = "yyyy-MM-dd")
			private Date createTimeEnd;

			}