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

zss

9 天以前 c483ee040589c0063724059228e7e6c8e4ff943c

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