java/zhihuishenqu.git

			@@ -21,6 +21,19 @@
			@ApiModelProperty(value = "订单状态(1.等待配送 2.配送中 3.待收货 4.待评价 5.已完成 6.已取消 7.已退款)")
			private Integer status;

			@ApiModelProperty(value = "自提点id")
			private Long pointId;

			@ApiModelProperty(value = "商户id")
			private Long storeId;

			@ApiModelProperty(value = "配送单id")
			private Long deliveryId;

			@ApiModelProperty(value = "配送方式（1.自提 2.快递）")
			private Integer deliveryType;


			@ApiModelProperty(value = "用户id", hidden = true)
			private Long userId;
			}