Merge branch 'develop' into release-test

@@ -356,7 +356,7 @@ const tentData = ref<any>({});
 const getTenantInformation = () => {
   const ps: any = [];
 
-  ps.push(getTenantDetailInfo(userData.tenantGuid).then((res: any) => {
+  ps.push(getTenantDetailInfo(serviceTenantGuid.value).then((res: any) => {
     if (res.code === proxy.$passCode) {
       const data = res.data ?? {};
       tentData.value = { ...tentData.value, ...data };

@@ -264,7 +264,7 @@ const tableBtnClick = (scope, btn) => {
   } else if (type === 'detail') { // 详情, 若是草稿中，详情就是编辑，
     router.push({
       name: 'registerInfoDetail',
-      query: { guid: row.guid, name: row.daName, tenantGuid: row.tenantGuid, type: 'asset' }
+      query: { guid: row.guid, name: row.daName, serviceTenantGuid: row.tenantGuid, type: 'asset' }
     });
   } else if (type === 'pass') {
     passDialogInfo.value.visible = true;