From d08e95f9a5a86c75ba7b8cd1e23b50a4eac41bff Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期五, 22 五月 2026 11:19:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_pro_河南鹤壁
---
src/main/resources/mapper/device/DeviceLedgerMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/device/DeviceLedgerMapper.xml b/src/main/resources/mapper/device/DeviceLedgerMapper.xml
index c980120..f3b674e 100644
--- a/src/main/resources/mapper/device/DeviceLedgerMapper.xml
+++ b/src/main/resources/mapper/device/DeviceLedgerMapper.xml
@@ -88,7 +88,7 @@
where id = #{id}
</select>
<select id="getDeviceTypeDistributionByYear"
- resultType="com.ruoyi.account.dto.DeviceTypeDetail"
+ resultType="com.ruoyi.account.bean.dto.DeviceTypeDetail"
parameterType="java.lang.Integer">
SELECT
`type`,
--
Gitblit v1.9.3