From 168b0d2b658fffb2cf3fd1cf569a6c7b25c36a47 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 02 三月 2026 17:04:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_kthg' into dev_New_kthg
---
src/main/resources/mapper/device/DeviceRepairMapper.xml | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/device/DeviceRepairMapper.xml b/src/main/resources/mapper/device/DeviceRepairMapper.xml
index 8969d0c..76f48f3 100644
--- a/src/main/resources/mapper/device/DeviceRepairMapper.xml
+++ b/src/main/resources/mapper/device/DeviceRepairMapper.xml
@@ -14,7 +14,6 @@
dr.maintenance_name,
dr.maintenance_time,
dr.maintenance_result,
- dr.maintenance_price,
dr.status,
dr.create_time,
dr.update_time,
@@ -22,7 +21,8 @@
dr.update_user,
dr.tenant_id,
dl.device_name,
- dl.device_model
+ dl.device_model,
+ dr.spare_parts_ids
from device_repair dr
left join device_ledger dl on dr.device_ledger_id = dl.id
<where>
@@ -60,7 +60,6 @@
dr.maintenance_name,
dr.maintenance_time,
dr.maintenance_result,
- dr.maintenance_price,
dr.status,
dr.create_time,
dr.update_time,
--
Gitblit v1.9.3