java/YiFeiNN.git

			@@ -59,7 +59,7 @@

			@ApiModelProperty("医废类型（数据字典id)")
			@TableField("WASTE_TYPE")
			private Integer wasteType;
			private Long wasteType;

			@ApiModelProperty("医废类型名称(冗余)")
			@TableField("WASTE_TYPE_STR")
			@@ -77,13 +77,17 @@
			@TableField("CHECKOUT_TIME")
			private Date checkoutTime;

			@ApiModelProperty("医废状态 1：暂存中 2：运输中 3：已接收 4：已处置")
			@ApiModelProperty("医废状态 1：暂存中; 2：运输中; 3：已接收; 4：已处置;")
			@TableField("STATUS")
			private Integer status;

			@ApiModelProperty("封箱时间")
			@TableField("BOX_TIME")
			private Date boxTime;

			@ApiModelProperty("接收人id")
			@TableField("RECEIVE_USER_ID")
			private Long receiveUserId;

			@ApiModelProperty("收集人id")
			@TableField("COLLECT_USER_ID")
			@@ -93,5 +97,30 @@
			@TableField("COLLECT_TIME")
			private Date collectTime;

			@ApiModelProperty("接收时间")
			@TableField("RECEIVE_TIME")
			private Date receiveTime;
			@ApiModelProperty("司机用户id")
			@TableField("DRIVER_ID")
			private Long driverId;
			@ApiModelProperty("车辆id")
			@TableField("CAR_ID")
			private Long carId;
			@ApiModelProperty("处置时间")
			@TableField("DISPOSAL_TIME")
			private Date disposalTime;

			@ApiModelProperty("处置用户ID")
			@TableField("DISPOSAL_USER_ID")
			private Long disposalUserId;

			@ApiModelProperty("接收部门id")
			@TableField("RECEIVE_DEPARTMENT_ID")
			private Long receiveDepartmentId;






			}