From caa2b51bb4133f5a2e59eac242e744fb57f864a0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 10 九月 2024 13:01:44 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/query/ChargingOrderQuery.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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..a7ecf9f 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
@@ -9,7 +9,7 @@
import java.util.List;
@Data
-@ApiModel(value = "ChargingOrderQuery对象",description = "管理后台充电订单查询对象")
+@ApiModel(value = "ChargingOrderQuery充电桩订单查询对象",description = "管理后台充电桩订单查询对象")
public class ChargingOrderQuery extends BasePage {
@ApiModelProperty(value = "订单编号")
private String code;
@@ -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