Merge pull request #7238 from abpframework/auto-merge/rel-4-1/77

Merge branch rel-4.2 with rel-4.1

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

@@ -9,7 +9,7 @@ import { parseGenerics } from './tree';
 export function createTypeSimplifier() {
   const parseType = createTypeParser(t => {
     let type = t.replace(
-      /System\.([0-9A-Za-z.]+)/g,
+      /(?<![^<, ])System\.([0-9A-Za-z.]+)/g,
       (_, match) => SYSTEM_TYPES.get(match) ?? 'any',
     );