Merge branch 'ft-dev' into 'main'

fix:修改所属组织字段

See merge request huang/yun-teng-iot-front!202

@@ -16,11 +16,6 @@ export const columns: BasicColumn[] = [
     width: 120,
   },
   {
-    title: '厂家',
-    dataIndex: 'brand',
-    width: 120,
-  },
-  {
     title: '摄像头编号',
     dataIndex: 'sn',
     width: 120,
@@ -32,7 +27,7 @@ export const columns: BasicColumn[] = [
   },
   {
     title: '所属组织',
-    dataIndex: 'organizationDTO.name',
+    dataIndex: 'organizationName',
     width: 160,
   },
   {