From 96908b2033251bf5b048dcc3d4a7de3af006fec6 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Mon, 8 May 2023 09:27:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cyf/api/crudeoiloutbound/CrudeOilOutboundVo.java          | 1 +
 .../cyf/biz/crudeoiloutbound/CrudeOilOutboundMapper.xml       | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiloutbound/CrudeOilOutboundVo.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiloutbound/CrudeOilOutboundVo.java
index 9a8d5c02..efc8ddbc 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiloutbound/CrudeOilOutboundVo.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiloutbound/CrudeOilOutboundVo.java
@@ -34,4 +34,5 @@ public class CrudeOilOutboundVo implements Vo {
     private double inventory=0;
     private String flowmeterSid;
     private String flowmeterName;
+    private String flowmeterNumber;
 }
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiloutbound/CrudeOilOutboundMapper.xml b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiloutbound/CrudeOilOutboundMapper.xml
index c4824d6d..828a16de 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiloutbound/CrudeOilOutboundMapper.xml
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiloutbound/CrudeOilOutboundMapper.xml
@@ -5,8 +5,8 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.crudeoiloutbound.CrudeOilOutboundVo">
         SELECT
-        *,t.number as tankNumber,i.number as crudeNumber,i.name as crudeName,t.inventory as inventory,f.name as flowmeterName ,
-        f.number as fleowmeterNumber
+        *,t.number as tankNumber,i.number as crudeNumber,i.name as crudeName,t.inventory as inventory,f.name as flowmeterName,
+        f.number as flowmeterNumber
         FROM
         crude_oil_outbound c
         left join flowmeter_information f on f.sid=c.flowmeterSid