From 611332c6e1b51b00b9b259c14499ff8725bb98ca Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期三, 07 五月 2025 09:42:14 +0800 Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou into dev --- ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderQueryRequest.java | 17 +++++++++++++++++ 1 files changed, 17 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 51cbca6..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 @@ -29,6 +29,9 @@ @ApiModelProperty("订单状态(0:待派单;1:待上门;2:待完工;3:已完结;4:已取消;5:已改派)") private Integer state; + private Integer fake; + private String address; + @ApiModelProperty("师傅名称") private String workerName; @@ -62,5 +65,19 @@ @ApiModelProperty("城市列表") private List<String> cityList; + @ApiModelProperty("服务ids") + private List<Integer> servIds ; + @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