productDev/dmvisit.git

			@@ -30,7 +30,6 @@
			private Integer creator;

			@ApiModelProperty(value = "创建时间")
			@JsonFormat(pattern = "yyyy-MM-dd")
			private Date createDate;

			@ApiModelProperty(value = "更新人编码")
			@@ -63,7 +62,6 @@
			private String name;

			@ApiModelProperty(value = "访客年龄")
			@JsonFormat(pattern = "yyyy-MM-dd")
			private Date birthday;

			@ApiModelProperty(value = "手机号")
			@@ -86,7 +84,8 @@
			@ApiModelProperty(value = "海康门禁名称")
			@ExcelColumn(name="进厂门禁" ,index = 6,width = 12)
			private String deviceName;

			@ApiModelProperty(value = "车辆类型 0内部车辆 1相关方车辆 2访客车辆 3内运物流车 4外协车辆 5市公司卸货车 ")
			private Integer carType ;
			@ApiModelProperty(value = "海康门禁编码")
			private String deviceIndex;

			@@ -97,6 +96,8 @@

			@ApiModelProperty(value = "访客ID(关联member)")
			private Integer memberId;
			@ApiModelProperty(value = "访客1门禁事件2车辆事件")
			private String accessType;

			@ApiModelProperty(value = "事件类型码")
			private String eventCode;
			@@ -117,6 +118,13 @@
			@TableField(exist = false)
			private String keyWords;

			@ApiModelProperty(value = "类型 0劳务公司 1内部组织")
			@TableField(exist = false)
			private Integer companyType;
			@ApiModelProperty(value = "类型 0访客 1内部人员")
			@TableField(exist = false)
			private Integer memberType;

			@ApiModelProperty(value = "开始时间")
			@TableField(exist = false)
			private Date startTime;
			@@ -134,4 +142,16 @@
			@TableField(exist = false)
			public String excelCompanyName;


			@ApiModelProperty(value = "人数")
			@TableField(exist = false)
			private Integer num;


			@ApiModelProperty(value = "查询人员类型")
			@TableField(exist = false)
			private Integer queryUserType;



			}