Merge remote-tracking branch 'origin/master'

lyh

2025-06-25 4864c87d65e797d2ecd827b1eca9d46aec0950aa

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DevicePermissionServiceImpl.java

@@ -196,9 +196,9 @@
        populateEquipmentNodes(treeList, equipmentMap, userRealNameMap);
    }

/**
        * 获取授权设备ID集合
 */
    /**
     * 获取授权设备ID集合
    */
    private Set<String> getAuthorizedDeviceIds(String userId) {
        return super.list(new QueryWrapper<DevicePermission>().select("device_id").eq("user_id", userId))
                .stream()