From 044a57d2133b2363a6f0d3d167b3eaa587c70b91 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Thu, 31 Jul 2025 17:18:47 +0800
Subject: [PATCH] Merge branch 'pxb' into xin
---
oying-system/src/main/java/com/oying/modules/rider/domain/dto/RiderOrderRecordQueryCriteria.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/rider/domain/dto/RiderOrderRecordQueryCriteria.java b/oying-system/src/main/java/com/oying/modules/rider/domain/dto/RiderOrderRecordQueryCriteria.java
index 4ef50fc..51b05a9 100644
--- a/oying-system/src/main/java/com/oying/modules/rider/domain/dto/RiderOrderRecordQueryCriteria.java
+++ b/oying-system/src/main/java/com/oying/modules/rider/domain/dto/RiderOrderRecordQueryCriteria.java
@@ -27,6 +27,9 @@
@ApiModelProperty(value = "用户id")
private Long userId;
+ @ApiModelProperty(value = "手机号")
+ private String phone;
+
@ApiModelProperty(value = "订单编号")
private String orderNum;
@@ -45,6 +48,9 @@
@ApiModelProperty(value = "订单状态： 1-待取货 2-配送中 3-已完成 4-商家取消 5-骑手取消 6-客户取消 7-系统取消")
private String orderStatus;
+ @ApiModelProperty(value = "用户手机号")
+ private String userName;
+
@ApiModelProperty(value = "是否超时：1-是 0-否")
private String isOvertime;
private List<Timestamp> acceptTime;
--
Gitblit v1.9.3