java/HongRuiTang.git

			@@ -39,6 +39,9 @@
			@ApiModelProperty(value = "订单状态0.已取消1.待支付2.待核销3.已完成")
			private Integer orderStatus;

			@ApiModelProperty(value = "支付方式1.全款2.订金")
			private Integer payType;

			@ApiModelProperty(value = "商品总价")
			private BigDecimal orderGoodsMoney;

			@@ -73,6 +76,9 @@
			@ApiModelProperty(value="订单来源")
			private String orderFromDesc;

			@ApiModelProperty(value="活动名字")
			private String activityName;

			@ApiModelProperty(value="订单商品列表")
			private List<MerOrderGoodsPageVo> merOrderGoodsVoList;
			}