From daefd8311492bbf55f85a9d77c76f7a05eac88ec Mon Sep 17 00:00:00 2001
From: katherinehhh <katherine_15995@163.com>
Date: Fri, 24 Jan 2025 16:01:52 +0800
Subject: [PATCH] fix: merge bug

---
 .../pages/dynamic-page/components/MobileDatePicker.tsx      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/plugins/@nocobase/plugin-mobile/src/client/pages/dynamic-page/components/MobileDatePicker.tsx b/packages/plugins/@nocobase/plugin-mobile/src/client/pages/dynamic-page/components/MobileDatePicker.tsx
index 26006bb351..977cfb0a7a 100644
--- a/packages/plugins/@nocobase/plugin-mobile/src/client/pages/dynamic-page/components/MobileDatePicker.tsx
+++ b/packages/plugins/@nocobase/plugin-mobile/src/client/pages/dynamic-page/components/MobileDatePicker.tsx
@@ -94,7 +94,7 @@ const MobileDateTimePicker = connect(
           />
         </div>
         <DatePicker
-          {...others}
+          {...rest}
           cancelText={t('Cancel')}
           confirmText={t('Confirm')}
           visible={visible}
@@ -104,8 +104,8 @@ const MobileDateTimePicker = connect(
           }}
           precision={showTime && picker === 'date' ? getPrecision(timeFormat) : picker === 'date' ? 'day' : picker}
           renderLabel={labelRenderer}
-          min={others.min || new Date(1000, 0, 1)}
-          max={others.max || new Date(9999, 11, 31)}
+          min={rest.min || new Date(1000, 0, 1)}
+          max={rest.max || new Date(9999, 11, 31)}
           onConfirm={(val) => {
             handleConfirm(val);
           }}