From 4e7f81ab7b37b5fc51c3054a36942adbcfb8dca8 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 03 九月 2024 19:12:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/MyChargingOrderList.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/MyChargingOrderList.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/MyChargingOrderList.java
index 1e3e064..0173c0d 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/MyChargingOrderList.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/MyChargingOrderList.java
@@ -32,7 +32,7 @@
@ApiModelProperty("订单时间")
private String createTime;
@ApiModelProperty("评价状态（1=待评价，2=已评价）")
- private Integer evaluate;
+ private Long evaluate;
@ApiModelProperty("电费")
private BigDecimal electricCharge;
@ApiModelProperty("服务费")
--
Gitblit v1.7.1