From f2dff53d76a7e9a23e6a2ecfed58ce978dc41442 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 06 九月 2024 18:22:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/ChargingListQuery.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/ChargingListQuery.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/ChargingListQuery.java
similarity index 70%
rename from ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/ChargingListQuery.java
rename to ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/ChargingListQuery.java
index 875df2f..10e711c 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/ChargingListQuery.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/ChargingListQuery.java
@@ -1,4 +1,4 @@
-package com.ruoyi.order.dto;
+package com.ruoyi.order.api.model;
import com.ruoyi.common.core.web.page.BasePage;
import io.swagger.annotations.ApiModel;
@@ -12,9 +12,11 @@
@ApiModel(value = "充电账单列表查询参数")
public class ChargingListQuery extends BasePage {
@ApiModelProperty("订单分类 1全站 2各个站点")
- private String category;
- @ApiModelProperty("账单周期2020-01-01 - 2020-01-01")
+ private String type;
+ @ApiModelProperty("账单周期2020-01-01 00:00:00 - 2020-01-01 23:59:59")
private String startTime;
@ApiModelProperty("1已出账 2未出账")
private Integer state;
+ @ApiModelProperty("uid 前端忽略")
+ private String uid;
}
--
Gitblit v1.7.1