Merge branch 'ft' into 'main_dev'

pref: 设备显示别名或名字

See merge request yunteng/thingskit-front!561

@@ -229,7 +229,7 @@
       deviceProfileId,
       deviceProfileId,
     });
     });
     entityOptions.value = res.map((item) => ({
     entityOptions.value = res.map((item) => ({
-      label: item.name,
+      label: item.alias || item.name,
       value: item.tbDeviceId,
       value: item.tbDeviceId,
     }));
     }));
   };
   };

@@ -221,7 +221,7 @@
       deviceProfileId,
       deviceProfileId,
     });
     });
     entityOptions.value = res.map((item) => ({
     entityOptions.value = res.map((item) => ({
-      label: item.name,
+      label: item.alias || item.name,
       value: item.tbDeviceId,
       value: item.tbDeviceId,
     }));
     }));
   };
   };