From c399c302a882ba6362b1d2f9cc7a70c0ef4b9f24 Mon Sep 17 00:00:00 2001
From: hurui <177768073@qq.com>
Date: Thu, 1 Aug 2024 10:07:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/bweb/controller/BsGasOrderController.java   | 4 ++--
 .../main/java/com/hfkj/model/order/ExportGasOrderModel.java   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bweb/src/main/java/com/bweb/controller/BsGasOrderController.java b/bweb/src/main/java/com/bweb/controller/BsGasOrderController.java
index 09be0c7..e140de0 100644
--- a/bweb/src/main/java/com/bweb/controller/BsGasOrderController.java
+++ b/bweb/src/main/java/com/bweb/controller/BsGasOrderController.java
@@ -292,7 +292,7 @@ public class BsGasOrderController {
                 model.setGasDiscount(gasOrder.getGasDiscount().compareTo(new BigDecimal("1")) != 0?gasOrder.getGasDiscount().multiply(new BigDecimal("100")).setScale(2).toString():"无");
                 model.setGasOilNo(gasOrder.getGasOilNo() + "#");
                 model.setGasGunNo(gasOrder.getGasGunNo() + "号枪");
-                model.setGasPricePlatform(gasOrder.getGasPricePlatform());
+                model.setGasPriceVip(gasOrder.getGasPriceVip());
                 model.setGasPriceGun(gasOrder.getGasPriceGun());
                 model.setGasPriceOfficial(gasOrder.getGasPriceOfficial());
                 model.setPayTypeName(gasOrder.getPayType()!=null? OrderPayTypeEnum.getDataByType(gasOrder.getPayType()).getName():"未支付");
@@ -326,7 +326,7 @@ public class BsGasOrderController {
             includeColumnFiledNames.add("gasOilNo");
             includeColumnFiledNames.add("gasGunNo");
             includeColumnFiledNames.add("gasDiscount");
-            includeColumnFiledNames.add("gasPricePlatform");
+            includeColumnFiledNames.add("gasPriceVip");
             includeColumnFiledNames.add("gasPriceGun");
             includeColumnFiledNames.add("gasPriceOfficial");
             includeColumnFiledNames.add("payTypeName");
diff --git a/service/src/main/java/com/hfkj/model/order/ExportGasOrderModel.java b/service/src/main/java/com/hfkj/model/order/ExportGasOrderModel.java
index d0a042f..8ef30a2 100644
--- a/service/src/main/java/com/hfkj/model/order/ExportGasOrderModel.java
+++ b/service/src/main/java/com/hfkj/model/order/ExportGasOrderModel.java
@@ -70,7 +70,7 @@ public class ExportGasOrderModel {
 
     @ColumnWidth(10)
     @ExcelProperty({ "加油信息", "平台价"})
-    private BigDecimal gasPricePlatform;
+    private BigDecimal gasPriceVip;
 
     @ColumnWidth(10)
     @ExcelProperty({ "加油信息", "油站价"})