java/LiquorAuction.git

			@@ -6,6 +6,7 @@
			import com.baomidou.mybatisplus.annotation.TableId;
			import com.baomidou.mybatisplus.annotation.TableLogic;
			import com.baomidou.mybatisplus.annotation.TableName;
			import com.ruoyi.common.core.enums.AuctionOrderTypeEnum;
			import com.ruoyi.common.core.enums.OrderFromEnum;
			import com.ruoyi.common.core.enums.OrderStatusEnum;
			import com.ruoyi.common.core.enums.PaymentMethodEnum;
			@@ -45,18 +46,15 @@
			@ApiModelProperty(value = "下单时间")
			private LocalDateTime orderTime;

			@ApiModelProperty(value = "订单来源 1=商品订单 2=秒杀订单 3=团购订单 4=保证金 5=拍卖订单")
			@ApiModelProperty(value = "订单来源 1=商品订单 2=秒杀订单 3=团购订单 4=拍卖订单")
			private OrderFromEnum orderFrom;

			@ApiModelProperty(value = "拍卖订单类型 1=普通拍品 2=拍卖会拍品")
			private AuctionOrderTypeEnum auctionType;

			@ApiModelProperty(value = "会员id")
			private Long memberId;

			@ApiModelProperty(value = "会员姓名")
			private String memberName;

			@ApiModelProperty(value = "联系方式")
			private String phoneNumber;


			@ApiModelProperty(value = "支付方式 1=微信 2=支付宝")
			private PaymentMethodEnum paymentMethod;

			@@ -109,24 +107,25 @@


			@ApiModelProperty(value = "快递单号")
			private String courier_number;
			private String courierNumber;

			@ApiModelProperty(value = "收货人姓名")
			private String receiver_name;
			private String receiverName;

			@ApiModelProperty(value = "收货人电话")
			private String receiver_phone;

			@ApiModelProperty(value = "省份/直辖市")
			private String receiver_province;
			private String receiverphone;

			@ApiModelProperty(value = "城市")
			private String receiver_city;
			private String receiverCity;

			@ApiModelProperty(value = "区")
			private String receiver_region;

			@ApiModelProperty(value = "详细地址")
			private String receiver_detail_address;
			private String receiverDetailAddress;


			@ApiModelProperty(value = "保证金")
			private BigDecimal bound;



			}