From c4664502dfdaffff555b532e65b51a57ac8b29c2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 16 十月 2024 17:51:32 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TOrderAppealVO.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TOrderAppealVO.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TOrderAppealVO.java
index cafe08b..b991d8e 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TOrderAppealVO.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TOrderAppealVO.java
@@ -4,10 +4,15 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
@Data
@ApiModel(value = "TOrderAppealVO对象", description = "订单申诉VO对象")
public class TOrderAppealVO extends TOrderAppeal {
+
+ @ApiModelProperty(value = "uid")
+ private String uid;
@ApiModelProperty(value = "充电订单")
private TChargingOrder chargingOrder;
@@ -15,10 +20,22 @@
@ApiModelProperty(value = "购物订单")
private TShoppingOrder shoppingOrder;
- @ApiModelProperty(value = "兑换订单")
- private TExchangeOrder exchangeOrder;
+ @ApiModelProperty(value = "商品名称")
+ private String goodsName;
+ @ApiModelProperty(value = "商品图片")
+ private String goodsPicture;
- @ApiModelProperty(value = "会员订单")
- private TVipOrder vipOrder;
+ @ApiModelProperty(value = "站点名称")
+ private String siteName;
+ @ApiModelProperty(value = "桩名称")
+ private String pileName;
+ @ApiModelProperty(value = "桩号")
+ private Integer pileNumber;
+ @ApiModelProperty(value = "枪名称")
+ private String gunName;
+ @ApiModelProperty(value = "枪号")
+ private String gunNumber;
+ @ApiModelProperty(value = "结束方式（0=异常终止，1=主动终止，2=满电终止，3=费用不足终止）")
+ private Integer endMode;
}
--
Gitblit v1.7.1