From dcff8ae4cd446921c85cc956a7e27bb715c3c582 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 10 九月 2024 11:39:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderListVO.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderListVO.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderListVO.java
index 286972a..051ce98 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderListVO.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderListVO.java
@@ -14,6 +14,8 @@
 public class ChargingOrderListVO  {
     @ApiModelProperty(value = "电站名称")
     private String siteName;
+    @ApiModelProperty(value = "订单状态")
+    private Integer status;
     @ApiModelProperty(value = "电站id")
     private Integer siteId;
     @ApiModelProperty(value = "充电桩id")

--
Gitblit v1.7.1