Merge branch 'dev_New_pro' into dev_pro_河南鹤壁

yuan

2026-05-23 893fda1fa8bc17002a866381e8940e1c31d11d93

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