From 43cc5a0104eb71d6d140c28aa526fcbcceb92169 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <9664676+pengyuthon@user.noreply.gitee.com> Date: Sat, 18 Oct 2025 20:20:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yuthon_hr_attendance/controllers/applet_attendance.py | 4 ++-- .../views/inherit_yuthon_property_views.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/yuthon_hr_attendance/controllers/applet_attendance.py b/yuthon_hr_attendance/controllers/applet_attendance.py index 4f156018c..37ef1f4b1 100644 --- a/yuthon_hr_attendance/controllers/applet_attendance.py +++ b/yuthon_hr_attendance/controllers/applet_attendance.py @@ -794,8 +794,8 @@ class AppletAttendance(Controller): state = electric.state electric_value = { 'id': electric.id, - 'current_meter': water.current_meter or 0, - 'current_read': water.current_read or 0, + 'current_meter': electric.current_meter or 0, + 'current_read': electric.current_read or 0, 'code': electric.archives_id.name or '', 'last_dosage': electric.last_dosage or 0, 'mater_data': str(electric.meter_date) if electric.meter_date else '', diff --git a/yuthon_property_approval/views/inherit_yuthon_property_views.xml b/yuthon_property_approval/views/inherit_yuthon_property_views.xml index 6d12c6e04..5b8a97038 100644 --- a/yuthon_property_approval/views/inherit_yuthon_property_views.xml +++ b/yuthon_property_approval/views/inherit_yuthon_property_views.xml @@ -38,7 +38,7 @@