From fbf430ea78304dc7ae60271090d082f05b21239b Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期四, 05 九月 2024 17:11:56 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TCharingOrderVO.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TCharingOrderVO.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TCharingOrderVO.java index 6a1db27..5929188 100644 --- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TCharingOrderVO.java +++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TCharingOrderVO.java @@ -8,14 +8,14 @@ import java.math.BigDecimal; @Data -@ApiModel(value = "TOrderAppealVO对象", description = "充电桩订单VO") +@ApiModel(value = "充电桩订单列表对象", description = "充电桩订单VO") public class TCharingOrderVO { @ApiModelProperty(value = "分页列表") private PageInfo<ChargingOrderVO> list; @ApiModelProperty(value = "总充电量") private BigDecimal total; @ApiModelProperty(value = "充电时长") - private BigDecimal time; + private Long time; @ApiModelProperty(value = "收入") private BigDecimal income; @ApiModelProperty(value = "电费") -- Gitblit v1.7.1