From d6ef18f23c4b298cb9b977ab3a5d65e2f4a39fe2 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 06 十一月 2024 18:02:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/request/OrderQueryRequest.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/request/OrderQueryRequest.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/request/OrderQueryRequest.java
index 6c6b4d1..0686171 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/request/OrderQueryRequest.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/request/OrderQueryRequest.java
@@ -4,6 +4,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.List;
+
/**
* @author HJL
* @version 1.0
@@ -25,7 +27,7 @@
@ApiModelProperty("预约手机号")
private String reservationPhone;
- @ApiModelProperty("订单状态((0:待派单；1:待接单；2:待上门；3:待完工；4:已完结；5:已取消))")
+ @ApiModelProperty("订单状态(0:待派单；1:待上门；2:待完工；3:已完结；4:已取消；5:已改派)")
private Integer state;
@ApiModelProperty("师傅名称")
@@ -55,4 +57,7 @@
@ApiModelProperty(value = "每页显示条数", required = true)
private Integer pageSize = 10;
+ @ApiModelProperty("导出ids集合")
+ private List<String> ids;
+
}
--
Gitblit v1.7.1