From ca6fade1a01de3b64a12d998a791cec1b2b8fe1a Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期五, 18 十月 2024 10:34:46 +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/model/ChargingListQuery.java | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/ChargingListQuery.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/ChargingListQuery.java index c4f9676..842cad4 100644 --- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/ChargingListQuery.java +++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/ChargingListQuery.java @@ -1,6 +1,7 @@ package com.ruoyi.order.api.model; import com.ruoyi.common.core.web.page.BasePage; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -8,6 +9,7 @@ import java.util.List; @Data +@ApiModel("充电时段统计DTO") public class ChargingListQuery extends BasePage { @ApiModelProperty("订单编号") private String code; @@ -20,6 +22,8 @@ private Integer type; @ApiModelProperty("状态(1未出账 2已出账)") private Integer state; + @ApiModelProperty("状态(1日结 2月结)") + private Integer orderState; @ApiModelProperty("uid 前端忽略") private String uid; -- Gitblit v1.7.1