From 2bdf6b86c427cd8a0f433d6a559d532eed67b733 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 13 八月 2026 13:40:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_意博凯信' into dev_天津_意博凯信

---
 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