Merge branch 'iteration-20240829-free' into jenkins-main

src/views/categroyManager/specialSetup/branchSetting.vue

@@ -540,7 +540,7 @@ export default {
       try {
         // 不管是添加、查看、修改都传-1
         const tenantId = -1;
-        const res = await queryTree({ enable: 1, tenantId });
+        const res = await queryTree({ enable: 1, tenantId, queryType: 'TENANT' });
         const rows = res.data || [];
         rows.forEach(item => {
           let children = [];

src/views/organManager/components/memberSetting.vue

@@ -195,7 +195,7 @@ export default {
       try {
         // 不管是添加、查看、修改都传-1
         const tenantId = -1;
-        const res = await queryTree({ enable: 1, tenantId });
+        const res = await queryTree({ enable: 1, tenantId, queryType: 'ALL' });
         const rows = res.data || [];
         rows.forEach(item => {
           let children = [];