Merge branch 'main_dev' into ft

@@ -154,7 +154,15 @@ export const step1Schemas: FormSchema[] = [
       const { organizationId, transportType } = formModel;
       if (![organizationId, transportType].every(Boolean)) return {};
       return {
-        api: getGatewayDevice,
+        api: async (params: Recordable) => {
+          try {
+            const result = await getGatewayDevice(params as any);
+            return result.map((item) => ({ ...item, alias: item.alias || item.name }));
+          } catch (e) {
+            console.error(e);
+            return [];
+          }
+        },
         showSearch: true,
         params: {
           organizationId,