Merge pull request #23633 from abpframework/auto-merge/rel-9-3/3962

Merge branch dev with rel-9.3

npm/ng-packs/packages/schematics/src/utils/model.ts

@@ -229,7 +229,7 @@ function renamePropForTenant(interfaces: Interface[]) {
       const isTenant = prop.name.toLocaleLowerCase().includes(TENANT_KEY);
       const isSaasDto = prop.refs.filter(f => f.startsWith(SAAS_NAMESPACE)).length > 0;
 
-      if (isTenant && isSaasDto) {
+      if (isTenant && isSaasDto && !prop.type.startsWith('Saas')) {
         prop.type = 'Saas' + prop.type;
       }
     }