Merge branch 'main_dev' into 'main'

Main dev

See merge request yunteng/thingskit-front!1373

@@ -58,7 +58,7 @@
             });
           }
           getTenantRoles(data.record.tenantId).then((result) => {
-            const { ...params } = data.record;
+            const { icon: _, ...params } = data.record;
             //为表单赋值
             setFieldsValue({
               ...params,