From a21a8b9b733edd59dbcd3f696d2b69f10c4c3fc9 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Fri, 12 Sep 2025 15:11:24 +0800
Subject: [PATCH] Merge branch 'pxb' into xin
---
oying-system/src/main/java/com/oying/modules/rider/domain/dto/RiderIncomeDetailQueryCriteria.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/rider/domain/dto/RiderIncomeDetailQueryCriteria.java b/oying-system/src/main/java/com/oying/modules/rider/domain/dto/RiderIncomeDetailQueryCriteria.java
index b6e92d3..f13e9b3 100644
--- a/oying-system/src/main/java/com/oying/modules/rider/domain/dto/RiderIncomeDetailQueryCriteria.java
+++ b/oying-system/src/main/java/com/oying/modules/rider/domain/dto/RiderIncomeDetailQueryCriteria.java
@@ -21,6 +21,9 @@
@ApiModelProperty(value = "骑手名字")
private String riderName;
+ @ApiModelProperty(value = "骑手ID")
+ private Long riderId;
+
@ApiModelProperty(value = "骑手手机号")
private String riderPhone;
@@ -38,5 +41,6 @@
@ApiModelProperty(value = "订单状态：1-待取货，2-配送中，3-已完成，4-已取消")
private String orderStatus;
- private List<Timestamp> updateTime;
+
+ private List<Timestamp> createTime;
}
--
Gitblit v1.9.3