From 1cf11872afc2a86eec4deb1366949d8aaca64bf1 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 28 Jun 2021 20:53:14 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-shop/src/main/java/com/xzx/gc/shop/dto/QueryJhyOrderListDto.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/dto/QueryJhyOrderListDto.java b/gc-shop/src/main/java/com/xzx/gc/shop/dto/QueryJhyOrderListDto.java
index de124f0..1023b43 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/dto/QueryJhyOrderListDto.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/dto/QueryJhyOrderListDto.java
@@ -16,7 +16,7 @@
private String account;
@ApiModelProperty(value="状态 1-待接单2-服务中3-已收款4-待入库5-已完成6-已取消")
- private String status;
+ private Integer status;
@JsonFormat(shape=JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty(value="预约开始时间")
@@ -25,4 +25,10 @@
@JsonFormat(shape=JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty(value="预约结束时间")
private Date reserveTimeEnd;
+
+ @ApiModelProperty(value="第几页",required=true)
+ private int page;
+
+ @ApiModelProperty(value="每一页数量",required=true)
+ private int limit;
}
--
Gitblit v1.9.1