From a0eae3ecda7b70468c60a0079db6c4609c29939d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 17 四月 2025 09:36:22 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/OrderQueryRequest.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/OrderQueryRequest.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/OrderQueryRequest.java
index 4b20406..25827f7 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/OrderQueryRequest.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/OrderQueryRequest.java
@@ -2,9 +2,8 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
import java.util.List;
+import lombok.Data;
/**
* @author HJL
@@ -24,6 +23,7 @@
@ApiModelProperty("品类")
private Integer classNameId;
+ private Integer serveId;
@ApiModelProperty("预约姓名")
private String reservationName;
@@ -75,4 +75,14 @@
@ApiModelProperty("服务ids")
private List<Integer> servIds ;
+ @ApiModelProperty("订单完成开始时间")
+ private String completeTimeStart;
+
+ @ApiModelProperty("订单完成结束时间")
+ private String completeTimeEnd;
+ private String[] siteIds;
+
+ @ApiModelProperty(value = "完工时间排序 1=升序 2=降序")
+ private Integer completeType ;
+
}
--
Gitblit v1.7.1