From 1f9fce626038ab8378f201677afa7df07188c4b5 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 22 八月 2024 17:33:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/query/ChargingOrderQuery.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/query/ChargingOrderQuery.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/query/ChargingOrderQuery.java
index 698baf7..267f10a 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/query/ChargingOrderQuery.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/query/ChargingOrderQuery.java
@@ -21,14 +21,16 @@
private Integer status;
@ApiModelProperty(value = "站点id")
private Integer siteId;
- @ApiModelProperty(value = "充电桩ids 逗号拼接")
- private String pileIds;
- @ApiModelProperty(value = "充电枪ids 逗号拼接")
- private String gunIds;
+ @ApiModelProperty(value = "充电桩id ")
+ private Integer pileId;
+ @ApiModelProperty(value = "充电枪id ")
+ private Integer gunId;
@ApiModelProperty(value = "开始时间2020-01-01 00:00:00 - 2021-01-01 23:59:59")
private String startTime;
@ApiModelProperty(value = "结束时间2020-01-01 00:00:00 - 2021-01-01 23:59:59")
private String endTime;
@ApiModelProperty(value = "订单来源 1明星 2快电 3新电途")
private Integer orderSource;
+ @ApiModelProperty(value = "用户ids 前端忽略")
+ private List<Long> userIds;
}
--
Gitblit v1.7.1