java/zhihuishenqu.git

			@@ -12,6 +12,9 @@
			@ApiModel("订单信息")
			public class ComShopOrderPageVO {

			@ApiModelProperty(value = "订单id")
			private Long orderId;

			@ApiModelProperty(value = "订单号")
			private String orderNo;

			@@ -67,9 +70,15 @@
			private List<ComShopOrderGoodsVO> orderGoodsVOList;

			@ApiModelProperty(value = "订单下店铺信息")
			private ComShopStoreVO shopStoreVO;
			private PageShopStoreVO shopStoreVO;

			@ApiModelProperty(value = "用户收货地址id")
			private ComShopUserAddressVO userAddressVO;

			@ApiModelProperty(value = "商品名称")
			private String goodsName;

			@ApiModelProperty(value = "订单日志")
			private List<ComShopOrderOperateVO> logs;

			}