From bf020bfe23c7e661e6cc4968998f0433beb4b030 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Tue, 13 Jun 2023 09:05:22 +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/app/crudeoiloutbound/CrudeOilOutboundAppMapper.xml      | 2 +-
 .../app/crudeoilpricerecord/CrudeOilPriceRecordAppMapper.xml    | 2 +-
 .../cyf/app/crudeoilstorage/CrudeOilStorageAppMapper.xml        | 2 +-
 .../crudeoilinventoryrecord/CrudeOilInventoryRecordMapper.xml   | 2 +-
 .../cyf/biz/crudeoiloutbound/CrudeOilOutboundMapper.xml         | 2 +-
 .../cyf/biz/crudeoilpricerecord/CrudeOilPriceRecordMapper.xml   | 2 +-
 .../supervise/cyf/biz/crudeoilstorage/CrudeOilStorageMapper.xml | 2 +-
 .../cyf/biz/materialinventory/MaterialInventoryMapper.xml       | 2 +-
 .../materialinventoryrecord/MaterialInventoryRecordMapper.xml   | 2 +-
 .../cyf/biz/materialoutbound/MaterialOutboundMapper.xml         | 2 +-
 .../supervise/cyf/biz/materialstorage/MaterialStorageMapper.xml | 2 +-
 .../cyf/biz/packaginginventory/PackagingInventoryMapper.xml     | 2 +-
 .../packaginginventoryrecord/PackagingInventoryRecordMapper.xml | 2 +-
 .../cyf/biz/packagingoutbound/PackagingOutboundMapper.xml       | 2 +-
 .../cyf/biz/packagingstorage/PackagingStorageMapper.xml         | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoiloutbound/CrudeOilOutboundAppMapper.xml b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoiloutbound/CrudeOilOutboundAppMapper.xml
index 789fecbe..121e1f31 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoiloutbound/CrudeOilOutboundAppMapper.xml
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoiloutbound/CrudeOilOutboundAppMapper.xml
@@ -5,7 +5,7 @@
     <!--    ${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.number as flowmeterNumber ,f.name as flowmeterName
+        c.*,t.number as tankNumber,i.number as crudeNumber,i.name as crudeName,t.inventory as inventory,f.number as flowmeterNumber ,f.name as flowmeterName
         FROM
         crude_oil_outbound c
         left join  tank_information t on t.sid =c.tankSid
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoilpricerecord/CrudeOilPriceRecordAppMapper.xml b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoilpricerecord/CrudeOilPriceRecordAppMapper.xml
index c238120e..99214338 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoilpricerecord/CrudeOilPriceRecordAppMapper.xml
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoilpricerecord/CrudeOilPriceRecordAppMapper.xml
@@ -5,7 +5,7 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.crudeoilpricerecord.CrudeOilPriceRecordVo">
         SELECT
-        *,t.number as tankNumber,i.number as crudeNumber,i.name as crudeName,t.inventory as inventory,
+        c.*,t.number as tankNumber,i.number as crudeNumber,i.name as crudeName,t.inventory as inventory,
         s.supplierName as supplierName
         FROM
         crude_oil_storage c
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoilstorage/CrudeOilStorageAppMapper.xml b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoilstorage/CrudeOilStorageAppMapper.xml
index b819d398..c879f6ea 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoilstorage/CrudeOilStorageAppMapper.xml
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoilstorage/CrudeOilStorageAppMapper.xml
@@ -5,7 +5,7 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.crudeoilstorage.CrudeOilStorageVo">
         SELECT
-        *,t.number as tankNumber,i.number as crudeNumber,i.name as crudeName,t.inventory as inventory,
+        c.*,t.number as tankNumber,i.number as crudeNumber,i.name as crudeName,t.inventory as inventory,
         s.supplierName as supplierName
         FROM
         crude_oil_storage c
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilinventoryrecord/CrudeOilInventoryRecordMapper.xml b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilinventoryrecord/CrudeOilInventoryRecordMapper.xml
index 840dac33..e4dcbf5c 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilinventoryrecord/CrudeOilInventoryRecordMapper.xml
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilinventoryrecord/CrudeOilInventoryRecordMapper.xml
@@ -5,7 +5,7 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.crudeoilinventoryrecord.CrudeOilInventoryRecordVo">
         SELECT
-        *,t.number as tankNumber
+        c.*,t.number as tankNumber
         FROM
         crude_oil_inventory_record c
         left join  tank_information t on t.sid =c.tankSid
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 c4856bec..3fab364a 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,7 +5,7 @@
     <!--    ${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.number as flowmeterNumber ,f.name as flowmeterName
+        c.*,t.number as tankNumber,i.number as crudeNumber,i.name as crudeName,t.inventory as inventory,f.number as flowmeterNumber ,f.name as flowmeterName
         FROM
         crude_oil_outbound c
         left join  tank_information t on t.sid =c.tankSid
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilpricerecord/CrudeOilPriceRecordMapper.xml b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilpricerecord/CrudeOilPriceRecordMapper.xml
index 42d85d61..c174a7f1 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilpricerecord/CrudeOilPriceRecordMapper.xml
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilpricerecord/CrudeOilPriceRecordMapper.xml
@@ -5,7 +5,7 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.crudeoilpricerecord.CrudeOilPriceRecordVo">
         SELECT
-        *,t.number as tankNumber,i.number as crudeNumber,i.name as crudeName,t.inventory as inventory,
+        c.*,t.number as tankNumber,i.number as crudeNumber,i.name as crudeName,t.inventory as inventory,
         s.supplierName as supplierName
         FROM
         crude_oil_storage c
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilstorage/CrudeOilStorageMapper.xml b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilstorage/CrudeOilStorageMapper.xml
index 7f75c1b3..3f0b10b2 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilstorage/CrudeOilStorageMapper.xml
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilstorage/CrudeOilStorageMapper.xml
@@ -5,7 +5,7 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.crudeoilstorage.CrudeOilStorageVo">
         SELECT
-        *,t.number as tankNumber,i.number as crudeNumber,i.name as crudeName,t.inventory as inventory,
+        c.*,t.number as tankNumber,i.number as crudeNumber,i.name as crudeName,t.inventory as inventory,
         s.supplierName as supplierName,d.orderNumber as contractNumber
         FROM
         crude_oil_storage c
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialinventory/MaterialInventoryMapper.xml b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialinventory/MaterialInventoryMapper.xml
index 4ec22d48..53b8bbab 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialinventory/MaterialInventoryMapper.xml
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialinventory/MaterialInventoryMapper.xml
@@ -5,7 +5,7 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.materialinventory.MaterialInventoryVo">
         SELECT
-        *,t.name as typeName
+        r.*,t.name as typeName
         FROM
         material_inventory r
         left join material_type t on t.sid=r.typeSid
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialinventoryrecord/MaterialInventoryRecordMapper.xml b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialinventoryrecord/MaterialInventoryRecordMapper.xml
index 78552553..8aa2c7b5 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialinventoryrecord/MaterialInventoryRecordMapper.xml
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialinventoryrecord/MaterialInventoryRecordMapper.xml
@@ -5,7 +5,7 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.materialinventoryrecord.MaterialInventoryRecordVo">
         SELECT
-        *,i.name as name,i.inventory as inventory,t.name as typeName
+        r.*,i.name as name,i.inventory as inventory,t.name as typeName
         FROM
         material_inventory_record r
         left join material_inventory i on r.inventorySid =i.sid
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialoutbound/MaterialOutboundMapper.xml b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialoutbound/MaterialOutboundMapper.xml
index 1631949d..b3f4c13f 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialoutbound/MaterialOutboundMapper.xml
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialoutbound/MaterialOutboundMapper.xml
@@ -5,7 +5,7 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.materialoutbound.MaterialOutboundVo">
         SELECT
-        *,t.name as typeName,i.inventory as inventory
+        o.*,t.name as typeName,i.inventory as inventory
         FROM
         material_outbound o
         left join material_inventory i on i.sid=o.inventorySid
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialstorage/MaterialStorageMapper.xml b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialstorage/MaterialStorageMapper.xml
index f2d8f8d2..bebfe20c 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialstorage/MaterialStorageMapper.xml
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialstorage/MaterialStorageMapper.xml
@@ -5,7 +5,7 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.materialstorage.MaterialStorageVo">
         SELECT
-        *,t.name as typeName,i.inventory as inventory
+        s.*,t.name as typeName,i.inventory as inventory
         FROM
         material_storage s
         left join material_inventory i on i.sid=s.inventorySid
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventory/PackagingInventoryMapper.xml b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventory/PackagingInventoryMapper.xml
index 617d04ed..6a6287d0 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventory/PackagingInventoryMapper.xml
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventory/PackagingInventoryMapper.xml
@@ -5,7 +5,7 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.packaginginventory.PackagingInventoryVo">
         SELECT
-        *,t.name as typeName
+        r.*,t.name as typeName
         FROM
         packaging_inventory r
         left join packaging_type t on t.sid=r.typeSid
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventoryrecord/PackagingInventoryRecordMapper.xml b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventoryrecord/PackagingInventoryRecordMapper.xml
index 04177564..c4071e70 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventoryrecord/PackagingInventoryRecordMapper.xml
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventoryrecord/PackagingInventoryRecordMapper.xml
@@ -5,7 +5,7 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.packaginginventoryrecord.PackagingInventoryRecordVo">
         SELECT
-        *,i.name as name,i.inventory as inventory,t.name as typeName
+        r.*,i.name as name,i.inventory as inventory,t.name as typeName
         FROM
         packaging_inventory_record r
         left join packaging_inventory i on r.inventorySid =i.sid
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingoutbound/PackagingOutboundMapper.xml b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingoutbound/PackagingOutboundMapper.xml
index ffba8530..f1f1a44c 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingoutbound/PackagingOutboundMapper.xml
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingoutbound/PackagingOutboundMapper.xml
@@ -5,7 +5,7 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.packagingoutbound.PackagingOutboundVo">
         SELECT
-        *,t.name as typeName,i.inventory as inventory
+        o.*,t.name as typeName,i.inventory as inventory
         FROM
         packaging_outbound o
         left join packaging_inventory i on i.sid=o.inventorySid
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingstorage/PackagingStorageMapper.xml b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingstorage/PackagingStorageMapper.xml
index 1fc0ed9f..e1c30249 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingstorage/PackagingStorageMapper.xml
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingstorage/PackagingStorageMapper.xml
@@ -5,7 +5,7 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.packagingstorage.PackagingStorageVo">
         SELECT
-        *,t.name as typeName,i.inventory as inventory,
+        s.*,t.name as typeName,i.inventory as inventory,
         u.sid as supplierSid, u.supplierName as supplierName
         FROM
         packaging_storage s