From 77930f84c8962eb365bb1bd9303d844555f93221 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 04 九月 2024 11:30:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/ChargingListQuery.java | 32 +++++++-------------------------
1 files changed, 7 insertions(+), 25 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/ChargingListQuery.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/ChargingListQuery.java
index e9187bb..875df2f 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/ChargingListQuery.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/ChargingListQuery.java
@@ -1,6 +1,7 @@
package com.ruoyi.order.dto;
import com.ruoyi.common.core.web.page.BasePage;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -8,31 +9,12 @@
import java.util.List;
@Data
+@ApiModel(value = "充电账单列表查询参数")
public class ChargingListQuery extends BasePage {
- @ApiModelProperty("订单编号")
- private String code;
-
- @ApiModelProperty("电站id")
- private Integer siteId;
- @ApiModelProperty("状态（0=未知，1=等待中，2=启动中，3=充电中，4=停止中，5=已结束）")
- private Integer status;
-
- @ApiModelProperty("手机号")
- private String phone;
- @ApiModelProperty("车牌号")
- private String licensePlate;
-
- @ApiModelProperty("订单类型（1=充电订单（小程序），2=充电订单（刷卡））")
- private Integer orderType;
-
- @ApiModelProperty("开始时间 2020-01-01 12:00:00 - 2020-01-01 23:00:00")
+ @ApiModelProperty("订单分类 1全站 2各个站点")
+ private String category;
+ @ApiModelProperty("账单周期2020-01-01 - 2020-01-01")
private String startTime;
-
- @ApiModelProperty("结束时间 2020-01-01 12:00:00 - 2020-01-01 23:00:00")
- private String endTime;
- @ApiModelProperty("用户ids 前端忽略")
- private List<Long> userIds;
- @ApiModelProperty("车辆ids 前端忽略")
- private List<Long> carIds;
-
+ @ApiModelProperty("1已出账 2未出账")
+ private Integer state;
}
--
Gitblit v1.7.1