java/HongRuiTang.git

			@@ -15,11 +15,22 @@
			public class MerOrderPageDto extends MerPageDto {



			@ApiModelProperty(value = "会员用户id")
			private Long memberUserId;

			@ApiModelProperty(value = "搜索关键词")
			private String keyword;


			@ApiModelProperty(value = "1.全部2.待核销3.已核销")
			private Integer type;

			@ApiModelProperty(value = "订单开始时间")
			private String startOrderDate;

			@ApiModelProperty(value = "订单结束时间")
			private String endOrderDate;

			@ApiModelProperty(value = "订单来源1.店铺商品2.平台秒杀活动3.线下创建")
			private Integer orderFrom;
			}