diff --git a/docs/template/modules/search.vue.vm b/docs/template/modules/search.vue.vm
index 26289a05..71e9b0cf 100644
--- a/docs/template/modules/search.vue.vm
+++ b/docs/template/modules/search.vue.vm
@@ -19,9 +19,12 @@ const { formRef, validate, restoreValidation } = useNaiveForm();
 
 #foreach ($column in $columns)
     #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-        #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+        #set($AttrName = $column.javaField.substring(0,1).toUpperCase() + $column.javaField.substring(1))
+
 const dateRange${AttrName} = ref<[string, string] | null>(null);
-#end#end
+
+    #end
+#end
 const model = defineModel<Api.$ModuleName.${BusinessName}SearchParams>('model', { required: true });
 
 const defaultModel = jsonClone(toRaw(model.value));
@@ -57,15 +60,6 @@ async function reset() {
 
 async function search() {
   await validate();
-#foreach ($column in $columns)
-    #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-        #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-  if (dateRange${AttrName}.value?.length) {
-    model.value.params!.begin${AttrName} = dateRange${AttrName}.value[0];
-    model.value.params!.end${AttrName} = dateRange${AttrName}.value[1];
-  }
-    #end
-#end
   emit('search');
 }
 </script>
@@ -111,6 +105,8 @@ async function search() {
                 type="datetimerange"
                 value-format="yyyy-MM-dd HH:mm:ss"
                 clearable
+                :default-time="['00:00:00', '23:59:59']"
+                @update:formatted-value="onDateRange${AttrName}Update"
               />
 #else              <NInput v-model:value="model.$column.javaField" placeholder="请输入$column.columnComment" />
     #end
diff --git a/src/views/monitor/logininfor/modules/login-infor-search.vue b/src/views/monitor/logininfor/modules/login-infor-search.vue
index 3913e37d..53a3cbd3 100644
--- a/src/views/monitor/logininfor/modules/login-infor-search.vue
+++ b/src/views/monitor/logininfor/modules/login-infor-search.vue
@@ -73,6 +73,7 @@ async function search() {
                 type="datetimerange"
                 value-format="yyyy-MM-dd HH:mm:ss"
                 clearable
+                :default-time="['00:00:00', '23:59:59']"
                 @update:formatted-value="onDateRangeLoginTimeUpdate"
               />
             </NFormItemGi>
diff --git a/src/views/monitor/operlog/modules/oper-log-search.vue b/src/views/monitor/operlog/modules/oper-log-search.vue
index 9fcca06f..661bbf9b 100644
--- a/src/views/monitor/operlog/modules/oper-log-search.vue
+++ b/src/views/monitor/operlog/modules/oper-log-search.vue
@@ -84,6 +84,7 @@ async function search() {
                 type="datetimerange"
                 value-format="yyyy-MM-dd HH:mm:ss"
                 clearable
+                :default-time="['00:00:00', '23:59:59']"
                 @update:formatted-value="onDateRangeOperTimeUpdate"
               />
             </NFormItemGi>
diff --git a/src/views/system/config/modules/config-search.vue b/src/views/system/config/modules/config-search.vue
index cb4df2f4..99de3fef 100644
--- a/src/views/system/config/modules/config-search.vue
+++ b/src/views/system/config/modules/config-search.vue
@@ -91,6 +91,7 @@ async function search() {
                 type="datetimerange"
                 value-format="yyyy-MM-dd HH:mm:ss"
                 clearable
+                :default-time="['00:00:00', '23:59:59']"
                 @update:formatted-value="onDateRangeCreateTimeUpdate"
               />
             </NFormItemGi>
diff --git a/src/views/system/oss/modules/oss-search.vue b/src/views/system/oss/modules/oss-search.vue
index 3a68b01b..1c107978 100644
--- a/src/views/system/oss/modules/oss-search.vue
+++ b/src/views/system/oss/modules/oss-search.vue
@@ -71,6 +71,7 @@ async function search() {
                 type="datetimerange"
                 value-format="yyyy-MM-dd HH:mm:ss"
                 clearable
+                :default-time="['00:00:00', '23:59:59']"
                 @update:formatted-value="onDateRangeCreateTimeUpdate"
               />
             </NFormItemGi>
diff --git a/src/views/system/role/modules/role-search.vue b/src/views/system/role/modules/role-search.vue
index d2c9ad40..c4e2bc51 100644
--- a/src/views/system/role/modules/role-search.vue
+++ b/src/views/system/role/modules/role-search.vue
@@ -70,11 +70,10 @@ async function search() {
             <NFormItemGi span="24 s:12 m:6" label="创建时间" path="createTime" class="pr-24px">
               <NDatePicker
                 v-model:formatted-value="dateRangeCreateTime"
-                update-value-on-close
-                class="w-full"
-                type="daterange"
-                value-format="yyyy-MM-dd"
+                type="datetimerange"
+                value-format="yyyy-MM-dd HH:mm:ss"
                 clearable
+                :default-time="['00:00:00', '23:59:59']"
                 @update:formatted-value="onDateRangeCreateTimeUpdate"
               />
             </NFormItemGi>
diff --git a/src/views/system/user/modules/user-search.vue b/src/views/system/user/modules/user-search.vue
index 7ff8b3bb..50b0240e 100644
--- a/src/views/system/user/modules/user-search.vue
+++ b/src/views/system/user/modules/user-search.vue
@@ -91,6 +91,7 @@ async function search() {
                 type="datetimerange"
                 value-format="yyyy-MM-dd HH:mm:ss"
                 clearable
+                :default-time="['00:00:00', '23:59:59']"
                 @update:formatted-value="onDateRangeCreateTimeUpdate"
               />
             </NFormItemGi>
diff --git a/src/views/tool/gen/modules/gen-table-search.vue b/src/views/tool/gen/modules/gen-table-search.vue
index c2900a81..eafcd678 100644
--- a/src/views/tool/gen/modules/gen-table-search.vue
+++ b/src/views/tool/gen/modules/gen-table-search.vue
@@ -24,17 +24,18 @@ const { formRef, validate, restoreValidation } = useNaiveForm();
 
 const model = defineModel<Api.Tool.GenTableSearchParams>('model', { required: true });
 
-const dateRange = ref<[string, string]>();
-
-function onDateRangeUpdate(value: [string, string] | null) {
-  if (value?.length) {
-    model.value.params!.beginTime = value[0];
-    model.value.params!.endTime = value[1];
-  }
-}
+const dateRangeCreateTime = ref<[string, string] | null>(null);
 
 const defaultModel = jsonClone(toRaw(model.value));
 
+function onDateRangeCreateTimeUpdate(value: [string, string] | null) {
+  model.value.params = {
+    ...model.value.params,
+    beginTime: value?.[0],
+    endTime: value?.[1]
+  };
+}
+
 function resetModel() {
   model.value.params!.beginTime = null;
   model.value.params!.endTime = null;
@@ -70,11 +71,12 @@ async function search() {
             </NFormItemGi>
             <NFormItemGi span="24 s:12 m:6" label="创建时间" label-width="auto" class="pr-24px">
               <NDatePicker
-                v-model:formatted-value="dateRange"
+                v-model:formatted-value="dateRangeCreateTime"
                 value-format="yyyy-MM-dd HH:mm:ss"
-                type="daterange"
+                type="datetimerange"
                 clearable
-                @update:formatted-value="onDateRangeUpdate"
+                :default-time="['00:00:00', '23:59:59']"
+                @update:formatted-value="onDateRangeCreateTimeUpdate"
               />
             </NFormItemGi>
             <NFormItemGi :show-feedback="false" span="24" class="pb-6px pr-24px">