java/HongRuiTang.git

			@@ -24,6 +24,9 @@
			@ApiModelProperty(value = "订单id")
			private String orderId;

			@ApiModelProperty(value="活动id")
			private String activityId;

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

			@@ -43,6 +46,9 @@
			@ApiModelProperty(value="商品数量")
			private Integer goodsNum;

			@ApiModelProperty(value="核销商户类型（0=全部店铺，1=部分商户，2=单个商户）")
			private Integer shopNumber;

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