Merge remote-tracking branch 'origin/master'

“mitao”

2026-01-21 34e22679dfe43d9b24aa865292484b31d7511efd

 ruoyi-system/src/main/resources/mapper/system/DeviceUsageMapper.xml

@@ -16,7 +16,7 @@
        <result column="disabled" property="disabled" />
    </resultMap>
    <select id="getDeviceUsageList" resultType="java.lang.String">
        select t3.properties from device_usage t1
        select t2.properties from device_usage t1
        left join device t2 on t1.device_id = t2.id
        where t1.project_id =#{id}
    </select>
@@ -52,7 +52,7 @@
        from device t1
            left join device_usage t2
        on t1.id = t2.device_id
        where t2.project_id = #{projectId} and t2.deleted = 0
        where t2.project_id = #{id} and t2.deleted = 0
        group by t1.type
    </select>