From 8ca2d2b49dccc417baad02c003eb7d9ae7dacc56 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期五, 26 七月 2024 15:49:53 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmWorkReportHistoryMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmWorkReportHistoryMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmWorkReportHistoryMapper.xml
index e23deda..19484c7 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmWorkReportHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmWorkReportHistoryMapper.xml
@@ -470,7 +470,7 @@
       wo.water_press AS waterPress,
       wo.water_instant AS waterInstant,
       wo.water_total AS waterTotal,
-      wo.ele_total AS ele_total,
+      wo.ele_total AS eleTotal,
       wo.money_remain AS moneyRemain,
       wo.water_remain AS waterRemain,
       wo.this_ele AS thisEle,

--
Gitblit v1.8.0