From 18d2ac4785e5ff819fe077bdd4eb4ee9731ab454 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 24 十月 2024 11:46:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/export/TChargingOrderExport.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/export/TChargingOrderExport.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/export/TChargingOrderExport.java
index 08c1165..8ea61be 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/export/TChargingOrderExport.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/export/TChargingOrderExport.java
@@ -18,6 +18,7 @@
private String siteCode;
@Excel(name = "电站名称",width = 30)
private String siteName;
+
@Excel(name = "终端名称",width = 30)
private String terminalName;
@Excel(name = "所属城市",width = 30)
@@ -30,6 +31,8 @@
private Integer siteType;
@Excel(name = "售电模式",width = 30,replace = {"正常使用_1","维修中_2","关闭下线_3"})
private String saleType;
+ @Excel(name = "站点状态",width = 30,replace = {"正常使用_1","维修中_2","关闭下线_3"})
+ private String status;
@Excel(name = "运营类型",width = 30,replace = {"直营_1","非直营_2"})
private String businessCategory;
@Excel(name = "计费模板",width = 30)
--
Gitblit v1.7.1