From 0fcc6eb314fafab572def73100584d353089ee8c Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期六, 10 一月 2026 16:29:30 +0800
Subject: [PATCH] Merge branch 'dev_tide_sbjkxt' into dev_tide_sbjkxt_xindao

---
 src/main/resources/mapper/device/DeviceLedgerMapper.xml |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/device/DeviceLedgerMapper.xml b/src/main/resources/mapper/device/DeviceLedgerMapper.xml
index b2a849f..e1c96ab 100644
--- a/src/main/resources/mapper/device/DeviceLedgerMapper.xml
+++ b/src/main/resources/mapper/device/DeviceLedgerMapper.xml
@@ -13,6 +13,11 @@
         dl.supplier_name,
         dl.unit,
         dl.number,
+        dl.status,
+        dl.plan_runtime_time,
+        dl.start_runtime_time,
+        dl.end_runtime_time,
+        dl.runtime_duration,
         dl.tax_including_price_unit,
         dl.tax_including_price_total,
         dl.tax_rate,
@@ -21,6 +26,9 @@
         dl.update_time ,
         su.user_name AS createUser,
         dl.update_user,
+        dl.device_brand,
+        dl.enable_depreciation,
+        dl.storage_location,
         dl.tenant_id
         FROM device_ledger dl
         left join sys_user su on dl.create_user = su.user_id

--
Gitblit v1.9.3