java/JiaDianHuiShou.git

			@@ -4,11 +4,13 @@
			import com.baomidou.mybatisplus.annotation.TableField;
			import com.baomidou.mybatisplus.annotation.TableId;
			import com.baomidou.mybatisplus.annotation.TableName;
			import com.fasterxml.jackson.annotation.JsonFormat;
			import com.ruoyi.common.core.domain.BaseEntity;
			import io.swagger.annotations.ApiModel;
			import io.swagger.annotations.ApiModelProperty;
			import lombok.Getter;
			import lombok.Setter;
			import org.springframework.format.annotation.DateTimeFormat;

			import java.math.BigDecimal;
			import java.util.Date;
			@@ -27,8 +29,12 @@
			@ApiModel(value = "Order对象", description = "订单管理")
			public class Order extends BaseEntity {

			@TableId(value = "id",type = IdType.AUTO)
			@TableId(value = "id", type = IdType.AUTO)
			private Integer id;

			@ApiModelProperty("下单城市")
			@TableField("city")
			private String city;

			@ApiModelProperty("订单编号")
			@TableField("order_number")
			@@ -76,6 +82,8 @@

			@ApiModelProperty("上门时间")
			@TableField("time")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
			@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
			private Date time;

			@ApiModelProperty("接单时间(师傅接单或后台派单，更新该字段时间)")
			@@ -118,8 +126,16 @@
			@TableField("complete_time")
			private Date completeTime;

			@ApiModelProperty("订单补贴金额")
			@TableField("subsidy")
			private BigDecimal subsidy;

			@ApiModelProperty("是否已提现(0:未提现，1:已提现)")
			@TableField("is_withdrawal")
			private Integer isWithdrawal;

			@ApiModelProperty("再投原因")
			@TableField(exist = false)
			private String applyReason;

			}