From 2bff8dc7884f418895adf57cd58eabd98d7b1926 Mon Sep 17 00:00:00 2001
From: "Xavier.Meng" <xavier.meng@fanruan.com>
Date: Tue, 3 Jan 2023 14:21:24 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A0jira=20fix(base/extend):=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=9B=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 typescript/core/base.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/typescript/core/base.ts b/typescript/core/base.ts
index e681f2ac4..137f6c2da 100644
--- a/typescript/core/base.ts
+++ b/typescript/core/base.ts
@@ -178,7 +178,7 @@ export interface _base {
     functions: (object: object) => string[];
 
     extend<T extends object>(object: T): T;
-    extend<T extends object, U extends object>(object: T, ...sources: U[]): T & UnionToIntersection<U>;
+    extend<T extends object, U>(object: T, ...sources: U[]): T & UnionToIntersection<NonNullable<U>>;
 
     defaults: (object: object, ...sources: any[]) => object;
 

From 63ad720ce6ac3239a315b2b5be7efc648e6d16aa Mon Sep 17 00:00:00 2001
From: data <dep@finereport.com>
Date: Tue, 3 Jan 2023 14:45:48 +0800
Subject: [PATCH 2/2] auto upgrade version to 2.0.20230103144542

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 373dd1c5f..9986805ad 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20230103111549",
+  "version": "2.0.20230103144542",
   "description": "fineui",
   "main": "dist/fineui_without_conflict.min.js",
   "types": "dist/lib/index.d.ts",