From 06ea0fe23faf2238d9d1141826ecb404367aecec Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期五, 18 十月 2024 10:49:38 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java index 0202131..c029cb1 100644 --- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java +++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java @@ -204,7 +204,7 @@ private LocalDateTime refundTime; @ApiModelProperty(value = "总电量") @TableField("total_electricity") - private BigDecimal totalElectricity;// 总电量 + private BigDecimal totalElectricity; @ApiModelProperty(value = "支付时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") -- Gitblit v1.7.1