java/qijisheng.git

			@@ -2,7 +2,6 @@

			import com.baomidou.mybatisplus.annotation.TableField;
			import com.baomidou.mybatisplus.annotation.TableId;
			import com.baomidou.mybatisplus.annotation.TableLogic;
			import com.baomidou.mybatisplus.annotation.TableName;
			import io.swagger.annotations.ApiModel;
			import io.swagger.annotations.ApiModelProperty;
			@@ -52,6 +51,10 @@
			@TableField("end_time")
			private LocalDateTime endTime;

			@ApiModelProperty(value = "核销人id")
			@TableField("canceller_app_user_id")
			private Long cancellerAppUserId;

			@ApiModelProperty(value = "售后截止日期")
			@TableField("after_sale_time")
			private LocalDateTime afterSaleTime;
			@@ -95,6 +98,10 @@
			@ApiModelProperty(value = "商品券抵扣总金额")
			@TableField("good_amount")
			private BigDecimal goodAmount;

			@ApiModelProperty(value = "用户优惠券id")
			@TableField("user_coupon_id")
			private Long userCouponId;

			@ApiModelProperty(value = "活动优惠金额")
			@TableField("activity_amount")
			@@ -162,7 +169,6 @@

			@ApiModelProperty(value = "删除标志（0=否，1=是）")
			@TableField("del_flag")
			@TableLogic
			private Integer delFlag;

			@ApiModelProperty(value = "添加时间")
			@@ -172,6 +178,18 @@
			@ApiModelProperty(value = "预计提货时间")
			@TableField("expected_delivery_time")
			private String expectedDeliveryTime;

			@ApiModelProperty("退款状态（1=退款中，2=已退款）")
			@TableField("refund_status")
			private Integer refundStatus;

			@ApiModelProperty("退款流水号")
			@TableField("refund_code")
			private String refundCode;

			@ApiModelProperty("退款时间")
			@TableField("refund_time")
			private LocalDateTime refundTime;


			}