From 9687fd99fdf6208dbf747ea45c440f192a9af815 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期五, 14 三月 2025 17:43:16 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-after into dev
---
cnas-device/src/main/resources/mapper/DeviceMaintenancePlanMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/cnas-device/src/main/resources/mapper/DeviceMaintenancePlanMapper.xml b/cnas-device/src/main/resources/mapper/DeviceMaintenancePlanMapper.xml
index fca2d48..2f8aac5 100644
--- a/cnas-device/src/main/resources/mapper/DeviceMaintenancePlanMapper.xml
+++ b/cnas-device/src/main/resources/mapper/DeviceMaintenancePlanMapper.xml
@@ -11,7 +11,7 @@
${ew.customSqlSegment}
</if>
</select>
- <select id="selectMaintenancePlanById" resultType="com.ruoyi.device.pojo.DeviceMaintenancePlan">
+ <select id="selectMaintenancePlanById" resultType="com.ruoyi.device.dto.DeviceMaintenancePlanDto">
select
dmp.*,
date_format(dmp.date_preparation, '%Y-%m-%d') as datePreparationStr,
--
Gitblit v1.9.3