Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

buhuazhen

7 天以前 c449e0d7e5e537cd8dfb5928572db31d0310bc0e

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