~jiangyouyao/beauty-erp.git

			@@ -48,9 +48,28 @@
			@ApiModelProperty(value ="客服微信")
			private String wechatImg;

			@ApiModelProperty(value =" 是否已领取（1：待领取2:已领取）")
			@ApiModelProperty(value ="客服电话")
			private String customerPhone ;

			@ApiModelProperty(value =" 是否已领取（1：待领取2:已领取 3：待配送 4：待收货 5:已失效）")
			private Integer state;

			/**
			* 收货人
			*/
			@ApiModelProperty(value ="收货人")
			private String consignee;
			/**
			* 联系电话
			*/
			@ApiModelProperty(value ="联系电话")
			private String consigneePhone;
			/**
			* 收货地址
			*/
			@ApiModelProperty(value =" 收货地址")
			private String consigneeAddress;

			@ApiModelProperty(value ="物流信息记录")
			private List<ShopLogisticsInfo> shopLogisticsInfos;