From 4b9e8610e48d5a4fd4e0ceb55c79b3f36146bc2b Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 20 三月 2025 17:41:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
index 2562032..29b0a51 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
@@ -35,6 +35,9 @@
@ApiModelProperty(value = "主键")
@TableId(value = "id", type = IdType.NONE)
private Long id;
+ @ApiModelProperty(value = "字符串主键")
+ @TableField(exist = false)
+ private String idStr;
@ApiModelProperty(value = "序号")
@TableField(exist = false)
private Integer xuhao;
@@ -48,9 +51,18 @@
@ApiModelProperty(value = "订单类型（1=充电订单（小程序），2=充电订单（刷卡））")
@TableField("order_type")
private Integer orderType;
- @ApiModelProperty(value = "0平台1其他")
+ @ApiModelProperty(value = "订单来源（1=自己平台，2=三方平台）")
@TableField("order_source")
private Integer orderSource;
+ @ApiModelProperty(value = "运营商id")
+ @TableField("operator_id")
+ private Integer operatorId;
+ @ApiModelProperty(value = "三方平台名称")
+ @TableField("tripartite_platform_name")
+ private String tripartitePlatformName;
+ @ApiModelProperty(value = "三方平台充电订单号")
+ @TableField("start_charge_seq")
+ private String startChargeSeq;
@ApiModelProperty(value = "平台或其他第三分名字")
@TableField("source_name")
@@ -73,6 +85,10 @@
@ApiModelProperty(value = "充电车辆 id")
@TableField("app_user_car_id")
private Long appUserCarId;
+
+ @ApiModelProperty(value = "充电车辆车牌号")
+ @TableField("plate_num")
+ private String plateNum;
@ApiModelProperty(value = "站点 id")
@TableField("site_id")
@@ -280,5 +296,8 @@
@ApiModelProperty(value = "车辆品牌")
@TableField(exist = false)
private String vehicleModel;
+ @ApiModelProperty(value = "时段数")
+ @TableField(exist = false)
+ private Long timeFrame;
}
--
Gitblit v1.7.1