From 8d9ca9f009d00214cb8d4ad8ce25ff08cc8506a4 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 09 一月 2025 13:49:23 +0800
Subject: [PATCH] Merge branch 'master' 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 | 10 ++++++++--
1 files changed, 8 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..4f4eafb 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,10 @@
@ApiModelProperty("服务ids")
private List<Integer> servIds ;
+ @ApiModelProperty("订单完成开始时间")
+ private String completeTimeStart;
+
+ @ApiModelProperty("订单完成结束时间")
+ private String completeTimeEnd;
+ private String[] siteIds;
}
--
Gitblit v1.7.1