From 7e92d9c7f76777c48f76376c99ffaae2e16fe7ed Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 01 七月 2025 14:37:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderQueryRequest.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderQueryRequest.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderQueryRequest.java
index c4bd1f8..6239fdf 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderQueryRequest.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderQueryRequest.java
@@ -70,5 +70,14 @@
@ApiModelProperty(value = "订单类型0:正常订单,1:后台订单")
private Integer type ;
+ @ApiModelProperty("订单完成开始时间")
+ private String completeTimeStart;
+
+ @ApiModelProperty("订单完成结束时间")
+ private String completeTimeEnd;
+ private List<String> siteIds;
+
+ @ApiModelProperty(value = "完工时间排序 1=升序 2=降序")
+ private Integer completeType ;
}
--
Gitblit v1.7.1