Merge branch 'ft' into 'main_dev'

fix: 修复报表配置设备属性之前取的identifier，应该取name字段问题

See merge request yunteng/thingskit-front!770

@@ -49,7 +49,7 @@ export const useHooks = () => {
       const item = ref<TSelectOption>();
       const item = ref<TSelectOption>();
       if (items?.identifier !== null) {
       if (items?.identifier !== null) {
         item.value = {
         item.value = {
-          label: items?.identifier,
+          label: items?.name,
           value: items?.identifier,
           value: items?.identifier,
         };
         };
         return item.value;
         return item.value;