From 50dfdaf4e3220e7c1f93a189879ea92bb8f46b4c Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 25 六月 2025 17:58:48 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into dev
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderListVO.java | 6 +++++-
1 files changed, 5 insertions(+), 1 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 e30cd56..2147175 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
@@ -31,8 +31,12 @@
private Long appUserCarId;
@ApiModelProperty(value = "车牌号")
private String plateNum;
+ @ApiModelProperty(value = "三方平台充电订单号")
+ private String startChargeSeq;
@ApiModelProperty(value = "充电枪id")
private Integer chargingGunId;
+ @ApiModelProperty(value = "订单来源（1=自己平台，2=三方平台）")
+ private Integer orderSource;
@ApiModelProperty(value = "订单编号")
private String code;
@ApiModelProperty(value = "订单类型（1=充电订单（小程序），2=充电订单（刷卡））")
@@ -66,7 +70,7 @@
@ApiModelProperty(value = "平台手续费")
private BigDecimal rechargeAmount;
@ApiModelProperty(value = "引流平台")
- private String sourceName;
+ private String tripartitePlatformName;
@ApiModelProperty(value = "平台分佣")
private BigDecimal sharingAmount;
@ApiModelProperty(value = "开始时间")
--
Gitblit v1.7.1