From 1f9fce626038ab8378f201677afa7df07188c4b5 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 22 八月 2024 17:33:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderVO.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderVO.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderVO.java
index 716f7a6..ab1db5f 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderVO.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderVO.java
@@ -1,6 +1,7 @@
package com.ruoyi.order.api.vo;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.order.api.model.TChargingOrder;
import com.ruoyi.order.api.model.TOrderEvaluate;
import io.swagger.annotations.ApiModel;
@@ -8,15 +9,12 @@
import lombok.Data;
import java.math.BigDecimal;
+import java.time.LocalDateTime;
import java.util.List;
@Data
@ApiModel(value = "SiteDetailEvaluateVO对象",description = "站点详情订单评价")
public class ChargingOrderVO extends TChargingOrder {
- @ApiModelProperty(value = "订单id")
- private Long id;
- @ApiModelProperty(value = "用户id")
- private Long userId;
@ApiModelProperty(value = "站点名称")
private String siteName;
@ApiModelProperty(value = "充电终端名称 桩+枪")
@@ -41,4 +39,5 @@
private Integer count;
@ApiModelProperty(value = "1明星充电 2快电 3新电途")
private Integer orderSource;
+
}
--
Gitblit v1.7.1