diff --git a/admin/src/components/analysis-xlsx/import-xlsx.vue b/admin/src/components/analysis-xlsx/import-xlsx.vue
new file mode 100644
index 0000000000000000000000000000000000000000..e833c1686baaa0226b1e06f7832670c93ec334d1
--- /dev/null
+++ b/admin/src/components/analysis-xlsx/import-xlsx.vue
@@ -0,0 +1,90 @@
+<script setup lang="ts">
+    import TablePopup from '@/components/analysis-xlsx/table.vue'
+    import {handlerJsonListCallbackByLimit} from "@/utils/util";
+    import feedback from '@/utils/feedback'
+    const emit = defineEmits(['uploadSuccess', 'uploadError','success','close','importApiFunc'])
+    const props = withDefaults(
+        defineProps<{
+            columnMap?: object
+            buttonTitle?: string
+            header?: "A"|number|string[]
+            rawNumbers?: boolean
+            raw?: boolean
+            skipHidden?: boolean
+            blankrows?: boolean
+            defval?: string | number | null
+        }>(),
+        {
+            defval: '',
+            columnMap: (() => ({})),
+            buttonTitle: "导入表格",
+        }
+    )
+    const tableRef = shallowRef<InstanceType<typeof TablePopup>>()
+
+    const showTable = ref(false)
+    const onSuccess = async (file: any) => {
+        showTable.value = true
+        emit('uploadSuccess',file)
+        await nextTick()
+        tableRef.value?.open('请确认要导入的数据',file)
+    }
+
+    const onError = async (file: any) => {
+        emit('uploadError',file)
+    }
+    const handleImportSubmit = async (list: Record<string, any>[]) => {
+        await feedback.loading('导入中')
+        try{
+            await handlerJsonListCallbackByLimit(list,500,async (subList: Record<string, any>,params) => {
+                return new Promise<void>((resolve, reject) => {
+                    emit('importApiFunc', {
+                        list: subList,
+                        columnMap: params
+                    }, () => {
+                        resolve()
+                    },(error:any)=>{
+                        reject(error)
+                    })
+                })
+            },props.columnMap)
+            await feedback.msgSuccess('导入成功')
+            showTable.value = false
+            await emit('success',list)
+        }catch (e) {
+            await feedback.msgError('导入失败')
+        }finally {
+            await feedback.closeLoading()
+        }
+    }
+
+    const handleImportClose = () => {
+        showTable.value = false
+        emit('close')
+    }
+</script>
+
+<template>
+    <analysisXlsx @success="onSuccess" @error="onError"
+                  :show-progress="false"
+                  :header="props.header"
+                  :rawNumbers="rawNumbers"
+                  :raw="raw"
+                  :skipHidden="skipHidden"
+                  :blankrows="blankrows"
+                  :defval="defval">
+        <el-button type="primary">{{props.buttonTitle}}</el-button>
+    </analysisXlsx>
+    <table-popup
+      v-if="showTable"
+      ref="tableRef"
+      :column-map="props.columnMap"
+      @success="handleImportSubmit"
+      @close="handleImportClose"
+    />
+
+</template>
+
+<style scoped lang="scss">
+
+</style>
\ No newline at end of file
diff --git a/admin/src/components/analysis-xlsx/table.vue b/admin/src/components/analysis-xlsx/table.vue
new file mode 100644
index 0000000000000000000000000000000000000000..ec52977e911e2fe1774dcda86fc5e52c34cdefe1
--- /dev/null
+++ b/admin/src/components/analysis-xlsx/table.vue
@@ -0,0 +1,127 @@
+<template>
+    <div class="edit-popup">
+        <popup
+          ref="popupRef"
+          :title="popupTitle"
+          :async="true"
+          width="100%"
+          @confirm="handleSubmit"
+          @close="handleClose"
+        >
+            <div v-if="columns.length==0">
+                暂无数据
+            </div>
+            <el-table
+              v-else
+              border
+              stripe
+              lazy
+              highlight-current-row
+              :data="state.list"
+            >
+                <el-table-column
+                  v-for="(item, index) in columns"
+                  :key="index"
+                  :prop="item.prop"
+                  :label="item.label"
+                >
+                    <template #default="scope">
+                        <div v-if="state.isEditMap[scope.$index+item.key]">
+                            <input
+                              v-model="state.tempValue"
+                              @input="inputEdit($event)"
+                              @blur="saveEdit(scope.$index, item.key, state.tempValue)"
+                              @keyup.enter="saveEdit(scope.$index, item.key, state.tempValue)"
+                              placeholder="请输入"
+                            />
+                        </div>
+                        <div v-else @click="startEdit(scope.$index, scope.row[item.key],item.key)">
+                            {{ scope.row[item.key] }}
+                            <el-icon class="edit-icon" size="12"><Edit /></el-icon>
+                        </div>
+                    </template>
+                </el-table-column>
+            </el-table>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="testDataEdit">
+import Popup from '@/components/popup/index.vue'
+const props = defineProps({
+    columnMap: {
+        type: Object,
+        default: () => ({})
+    }
+})
+const emit = defineEmits(['success', 'close'])
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+import { reactive, toRefs } from 'vue'
+
+// 弹窗数据
+const state = reactive<{
+    list: Record<string, any>[]
+    isEditMap: Record<string, boolean>
+    tempValue: string
+}>({
+    list: [],
+    isEditMap: {},
+    tempValue: ''
+})
+const popupTitle = ref('')
+const columns = ref<{ prop: string; label: string; key: string; }[]>([])
+
+const inputEdit = (e: any) =>  {
+    state.tempValue = e.target.value
+}
+const startEdit = (index: number, value: any, prop: string) => {
+    state.isEditMap[index + prop] = true
+    state.tempValue = value
+}
+
+const saveEdit = async (index: number, prop: string, value: any) => {
+    if (!state.isEditMap[index + prop]){
+        return
+    }
+    state.list[index][prop] =  value
+    state.isEditMap[index + prop] = false
+    state.tempValue = ''
+}
+// 提交按钮
+const handleSubmit = async () => {
+    popupRef.value?.close()
+    emit('success',state.list)
+}
+
+//打开弹窗
+const open = (title = '导入表格', xlsxData: Record<string, any>[] = []) => {
+    popupTitle.value = title
+    state.list = xlsxData
+    const columnList: { prop: string; label: string; key: string; }[] = []
+    if (xlsxData.length > 0) {
+        const keys = Object.keys(xlsxData[0])
+        keys.forEach((key: string,index: number) => {
+            // key去掉前后空格和换行符
+            const label = key.replace(/(^\s*)|(\s*$)/g, "")
+            columnList.push({
+                prop: props.columnMap[label] || label,
+                label: label,
+                key: key
+            })
+        })
+        columns.value = columnList
+    }
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+defineExpose({
+    open,
+})
+</script>
diff --git a/admin/src/views/template/component/upload.vue b/admin/src/views/template/component/upload.vue
index 3bebdc62c03e356318323c963d64241cb7609770..9c51ce36c8f2dd8559b2435de8582f69792afc59 100644
--- a/admin/src/views/template/component/upload.vue
+++ b/admin/src/views/template/component/upload.vue
@@ -60,6 +60,9 @@
                         <el-button type="primary">前端并解析xlsx生成json</el-button>
                     </analysisXlsx>
                 </div>
+                <div class="m-4">
+                    <analysisXlsxImport :columnMap="{}" buttonTitle="前端并解析xlsx分步导入"></analysisXlsxImport>
+                </div>
                 <div class="m-4">
                     <el-button type="primary" @click="createXlsx"> 前端根据json生成xlsx </el-button>
                 </div>
@@ -69,6 +72,7 @@
 </template>
 <script lang="ts" setup>
 import analysisXlsx from '@/components/analysis-xlsx/index.vue'
+import analysisXlsxImport from '@/components/analysis-xlsx/import-xlsx.vue'
 import Upload from '@/components/upload/index.vue'
 import UploadS3 from '@/components/upload/indexS3.vue'
 import { toSheet } from '@/utils/util'
diff --git a/server/app/adminapi/logic/auth/AdminLogic.php b/server/app/adminapi/logic/auth/AdminLogic.php
index 479cfbc7e518dd8ed6d0e76064ffa9767b7b6f05..4be76367b480408f69ad02ac52a587e83802c5c2 100644
--- a/server/app/adminapi/logic/auth/AdminLogic.php
+++ b/server/app/adminapi/logic/auth/AdminLogic.php
@@ -249,7 +249,7 @@ class AdminLogic extends BaseLogic
      * @author 乔峰
      * @date 2022/4/8 17:54
      */
-    public static function editSelf($params): int
+    public static function editSelf($params): mixed
     {
         $data = [
             'id' => $params['admin_id'],
diff --git a/server/app/common/service/generator/core/ListsGenerator.php b/server/app/common/service/generator/core/ListsGenerator.php
index 7bb480d7c8ee2531677ecce92aa0918f488f45d3..a195d1f3657bb50665a02a992d225029f718f4ff 100644
--- a/server/app/common/service/generator/core/ListsGenerator.php
+++ b/server/app/common/service/generator/core/ListsGenerator.php
@@ -40,6 +40,7 @@ class ListsGenerator extends BaseGenerator implements GenerateInterface
             '{NOTES}',
             '{AUTHOR}',
             '{DATE}',
+            '{FIELD_COMMENT_DATA}',
         ];
 
         // 等待替换的内容
@@ -57,6 +58,7 @@ class ListsGenerator extends BaseGenerator implements GenerateInterface
             $this->tableData['class_comment'],
             $this->getAuthorContent(),
             $this->getNoteDateContent(),
+            $this->getFieldAndCommentContent(),
         ];
 
         $templatePath = $this->getTemplatePath('php/lists');
@@ -258,7 +260,24 @@ class ListsGenerator extends BaseGenerator implements GenerateInterface
         }
         return substr($content, 0, -2);
     }
+    public function getFieldAndCommentContent()
+    {
+        $content = PHP_EOL;
+        $isExist = [$this->getPkContent()];
+        foreach ($this->tableColumn as $column) {
+            if ($column['is_lists'] && !in_array($column['column_name'], $isExist)) {
+                $content .= "'" . $column['column_name'] . "' => '" . ($column['column_comment'] ?: $column['column_name']) . "'," . PHP_EOL;
+                $isExist[] = $column['column_name'];
+            }
+            if ($this->isTreeCrud() && !in_array($column['column_name'], $isExist)
+                && in_array($column['column_name'], [$this->treeConfig['tree_id'], $this->treeConfig['tree_pid']])
+            ) {
+                $content .= "'" . $column['column_name'] . "' => '" . ($column['column_comment'] ?: $column['column_name']) . "'," . PHP_EOL;
+            }
+        }
+        return $content;
 
+    }
 
     /**
      * @notes 获取文件生成到模块的文件夹路径
diff --git a/server/app/common/service/generator/core/SqlGenerator.php b/server/app/common/service/generator/core/SqlGenerator.php
index c22f8a2a821f8f9e04471651c1b003332ac4403d..7c3ed27d26bf485b76953c23e20491c9e1d63dac 100644
--- a/server/app/common/service/generator/core/SqlGenerator.php
+++ b/server/app/common/service/generator/core/SqlGenerator.php
@@ -81,7 +81,7 @@ class SqlGenerator extends BaseGenerator implements GenerateInterface
      */
     public function getMenuTableNameContent()
     {
-        $tablePrefix = config('thinkorm.connections.mysql.prefix');
+        $tablePrefix = config('think-orm.connections.mysql.prefix');
         return $tablePrefix . 'system_menu';
     }
 
@@ -156,7 +156,7 @@ class SqlGenerator extends BaseGenerator implements GenerateInterface
      */
     public function getGenerateName()
     {
-        return 'menu.sql';
+        return 'menu'.$this->getTableName().'.sql';
     }
 
 
diff --git a/server/app/common/service/generator/core/VueIndexGenerator.php b/server/app/common/service/generator/core/VueIndexGenerator.php
index b89b6b9a0583887e96d9891f69db763cb856972c..83e46c858cbf3a4c93bed5f8dc58ea967c2e3c25 100644
--- a/server/app/common/service/generator/core/VueIndexGenerator.php
+++ b/server/app/common/service/generator/core/VueIndexGenerator.php
@@ -36,7 +36,8 @@ class VueIndexGenerator extends BaseGenerator implements GenerateInterface
             '{PERMS_ADD}',
             '{PERMS_EDIT}',
             '{PERMS_DELETE}',
-            '{SETUP_NAME}'
+            '{SETUP_NAME}',
+            '{COLUMN_MAP}'
         ];
 
         // 等待替换的内容
@@ -51,7 +52,8 @@ class VueIndexGenerator extends BaseGenerator implements GenerateInterface
             $this->getPermsContent(),
             $this->getPermsContent('edit'),
             $this->getPermsContent('delete'),
-            $this->getLowerCamelName()
+            $this->getLowerCamelName(),
+            $this->getColumnMapContent()
         ];
 
         $templatePath = $this->getTemplatePath('vue/index');
@@ -69,7 +71,18 @@ class VueIndexGenerator extends BaseGenerator implements GenerateInterface
         $this->setContent($content);
     }
 
+    public function getColumnMapContent()
+    {
+        $content = '';
+        foreach ($this->tableColumn as $column) {
+            if ($column['column_name'] == $this->getPkContent()){
+                continue;
+            }
+            $content .= "'" . $column['column_comment'] . "' : '" . ($column['column_name'] ?: $column['column_comment']) . "'," . PHP_EOL;
+        }
+        return $content;
 
+    }
     /**
      * @notes 获取搜索内容
      * @return string
@@ -173,20 +186,16 @@ class VueIndexGenerator extends BaseGenerator implements GenerateInterface
     public function getQueryParamsContent()
     {
         $content = '';
-        $queryDate = false;
         foreach ($this->tableColumn as $column) {
             if (!$column['is_query'] || $column['is_pk']) {
                 continue;
             }
-            $content .= $column['column_name'] . ": ''," . PHP_EOL;
             if ($column['query_type'] == 'between' && $column['view_type'] == 'datetime') {
-                $queryDate = true;
+                $content .= $column['column_name'] . ": []," . PHP_EOL;
+            }else{
+                $content .= $column['column_name'] . ": ''," . PHP_EOL;
             }
         }
-        if ($queryDate) {
-            $content .= "start_time: ''," . PHP_EOL;
-            $content .= "end_time: ''," . PHP_EOL;
-        }
         $content = substr($content, 0, -2);
         return $this->setBlankSpace($content, '    ');
     }
diff --git a/server/app/common/service/generator/stub/php/controller.stub b/server/app/common/service/generator/stub/php/controller.stub
index 6acd6946e70aeb7f6d6b17e2bb248d2371048810..ea39b77f3c3944bde819cf88b1fc7cf511dccf65 100644
--- a/server/app/common/service/generator/stub/php/controller.stub
+++ b/server/app/common/service/generator/stub/php/controller.stub
@@ -30,6 +30,21 @@ class {UPPER_CAMEL_NAME}Controller extends {EXTENDS_CONTROLLER}
         return $this->dataLists(new {UPPER_CAMEL_NAME}Lists());
     }
 
+    /**
+     * @notes json限制导入
+     * @return Response
+     * @author bingo
+     * @date {DATE}
+     */
+    public function importLimit(): Response
+    {
+        $params = input('params.');
+        $result = {UPPER_CAMEL_NAME}Logic::importLimit($params);
+        if (true === $result) {
+            return $this->success('导入成功', [], 1, 0);
+        }
+        return $this->fail({UPPER_CAMEL_NAME}Logic::getError());
+    }
 
     /**
      * @notes 添加{NOTES}
diff --git a/server/app/common/service/generator/stub/php/lists.stub b/server/app/common/service/generator/stub/php/lists.stub
index be061c4153128210319843998dc8a76a045abd03..271eaafc482fde0297578df651cb1ff6c1ed8b96 100644
--- a/server/app/common/service/generator/stub/php/lists.stub
+++ b/server/app/common/service/generator/stub/php/lists.stub
@@ -71,7 +71,7 @@ class {UPPER_CAMEL_NAME}Lists extends {EXTENDS_LISTS} implements ListsSearchInte
     public function setExcelFields(): array
     {
 
-        return [];
+        return [{FIELD_COMMENT_DATA}];
     }
 
     public function setFileName(): string
diff --git a/server/app/common/service/generator/stub/php/logic.stub b/server/app/common/service/generator/stub/php/logic.stub
index f498afd6621718724726d75ae2ea36170bbd80ab..dcdca576c30489c008e2d1b2769302dd4fe64545 100644
--- a/server/app/common/service/generator/stub/php/logic.stub
+++ b/server/app/common/service/generator/stub/php/logic.stub
@@ -6,6 +6,7 @@
 {USE}
 use app\common\logic\BaseLogic;
 use think\facade\Db;
+use ArrayObject;
 
 
 /**
@@ -84,4 +85,67 @@ class {UPPER_CAMEL_NAME}Logic extends BaseLogic
     {
         return {UPPER_CAMEL_NAME}::findOrEmpty($params['{PK}'])->toArray();
     }
+
+    /**
+     * @param array $fields 字段
+     * @param array $data 数据
+     * @param array $columnMap 字段映射
+     * @return array|false
+     */
+    public static function validateItem(array $fields, array $data,array $columnMap): array|false
+    {
+        $item = [];
+        $keys = array_keys($data);
+        foreach ($keys as $key) {
+            $label = trim($key);
+            $column = $label;
+            if (isset($columnMap[$label])) {
+                $column = $columnMap[$label];
+            }
+            if (in_array($column, $fields)) {
+                $item[$column] = $data[$key];
+            }
+        }
+        if (count(array_keys($item))==0){
+            return false;
+        }
+        return $item;
+    }
+
+    /**
+     * 限制导入
+     * @param array $params 请求参数
+     * @return bool
+     */
+    public static function importLimit(array $params): bool
+    {
+        $list = [];
+        if (isset($params['list'])){
+            $list = $params['list'];
+        }
+        $columnMap = new ArrayObject();
+        if (isset($params['columnMap'])){
+            $columnMap = $params['columnMap'];
+        }
+        if (count($list)==0){
+            self::setError('需要导入数据为0');
+            return false;
+        }
+        $obj = new {UPPER_CAMEL_NAME}();
+        $fields = $obj->getTableFields();
+        $saveList = [];
+        foreach ($list as $item) {
+            $item = self::validateItem($fields,$item,$columnMap);
+            if ($item){
+                $saveList[] = $item;
+            }
+        }
+        if (count($saveList)==0){
+            self::setError('数据校验后,需要导入数据为0');
+            return false;
+        }
+        $obj->insertAll($saveList);
+        return true;
+    }
+
 }
\ No newline at end of file
diff --git a/server/app/common/service/generator/stub/vue/api.stub b/server/app/common/service/generator/stub/vue/api.stub
index 9225f23177652ea636f166d02e7728917661138f..8a21976a9ea9532c779ed1c04e0e87fbd3761a70 100644
--- a/server/app/common/service/generator/stub/vue/api.stub
+++ b/server/app/common/service/generator/stub/vue/api.stub
@@ -1,4 +1,4 @@
-import request from '@/utils/request'
+import request, { requestNotTimeOut } from '@/utils/request'
 
 // {COMMENT}列表
 export function api{UPPER_CAMEL_NAME}Lists(params: any) {
@@ -23,4 +23,8 @@ export function api{UPPER_CAMEL_NAME}Delete(params: any) {
 // {COMMENT}详情
 export function api{UPPER_CAMEL_NAME}Detail(params: any) {
     return request.get({ url: "/{ROUTE}/detail", params })
+}
+// {COMMENT}限制导入
+export function api{UPPER_CAMEL_NAME}ImportLimit(params: any) {
+    return requestNotTimeOut.post({ url: "/{ROUTE}/importLimit", params })
 }
\ No newline at end of file
diff --git a/server/app/common/service/generator/stub/vue/form_item/radio.stub b/server/app/common/service/generator/stub/vue/form_item/radio.stub
index 4fcb4acf878d95577d9335fda67805cc472f54f0..fe5a3414dd5b347d08944b81d1c250b09e38d23b 100644
--- a/server/app/common/service/generator/stub/vue/form_item/radio.stub
+++ b/server/app/common/service/generator/stub/vue/form_item/radio.stub
@@ -3,7 +3,7 @@
         <el-radio
             v-for="(item, index) in dictData.{DICT_TYPE}"
             :key="index"
-            :label="{ ITEM_VALUE }"
+            :label="item.value"
         >
             {{ item.name }}
         </el-radio>
diff --git a/server/app/common/service/generator/stub/vue/form_item/select.stub b/server/app/common/service/generator/stub/vue/form_item/select.stub
index c43641f5531495c04ab5fa540e48f99741ba0eb3..ca0b51223aa1bb753266e987b536e5f352c2fb50 100644
--- a/server/app/common/service/generator/stub/vue/form_item/select.stub
+++ b/server/app/common/service/generator/stub/vue/form_item/select.stub
@@ -9,7 +9,7 @@
             v-for="(item, index) in dictData.{DICT_TYPE}"
             :key="index"
             :label="item.name"
-            :value="{ ITEM_VALUE }"
+            :value="item.value"
         />
     </el-select>
 </el-form-item>
\ No newline at end of file
diff --git a/server/app/common/service/generator/stub/vue/index.stub b/server/app/common/service/generator/stub/vue/index.stub
index beb9a906aa0f4bb50ea75e6137317b5a82fbacb5..28c29da6e44021b3f08ee9f455f432ace8294d43 100644
--- a/server/app/common/service/generator/stub/vue/index.stub
+++ b/server/app/common/service/generator/stub/vue/index.stub
@@ -27,12 +27,15 @@
                     </el-button>
                     <el-button v-perms="['{PERMS_DELETE}']" :disabled="!selectData.length" @click="handleDelete(selectData)">删除</el-button>
                 </div>
-                <export-data
-                    class="ml-2.5"
-                    :fetch-fun="api{UPPER_CAMEL_NAME}Lists"
-                    :params="queryParams"
-                    :page-size="9999"
-                />
+                <div  class="flex justify-between">
+                    <analysisXlsxImport :columnMap="columnMap" buttonTitle="导入" @importApiFunc="importLimit" @success="getLists"></analysisXlsxImport>
+                    <export-data
+                        class="ml-2.5"
+                        :fetch-fun="api{UPPER_CAMEL_NAME}Lists"
+                        :params="queryParams"
+                        :page-size="9999"
+                    />
+                </div>
             </div>
             <div class="mt-3">
                 <el-table
@@ -82,9 +85,10 @@
 </template>
 
 <script lang="ts" setup name="{SETUP_NAME}Lists">
+import analysisXlsxImport from '@/components/analysis-xlsx/import-xlsx.vue'
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
-import { api{UPPER_CAMEL_NAME}Lists, api{UPPER_CAMEL_NAME}Delete } from '@/api/{API_DIR}'
+import { api{UPPER_CAMEL_NAME}Lists, api{UPPER_CAMEL_NAME}Delete,api{UPPER_CAMEL_NAME}ImportLimit } from '@/api/{API_DIR}'
 import { timeFormat } from '@/utils/util'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
@@ -96,6 +100,23 @@ const indexMethod = (index: number) => {
 // 是否显示编辑框
 const showEdit = ref(false)
 
+// 映射字段
+const columnMap = {
+{COLUMN_MAP}
+}
+
+//导入
+const importLimit = async (params: any, callbackSuccess?: any, callbackError?: any) => {
+    try {
+        // 执行实际的导入逻辑
+        await api{UPPER_CAMEL_NAME}ImportLimit(params)
+        // 完成后调用回调
+        callbackSuccess && callbackSuccess()
+    } catch (error) {
+        // 处理错误
+        callbackError && callbackError(error)
+    }
+}
 
 // 查询条件
 const queryParams = reactive({
diff --git a/server/app/common/service/generator/stub/vue/search_item/datetime.stub b/server/app/common/service/generator/stub/vue/search_item/datetime.stub
index 0d536ba500af8dfa8da32d56fe3f7ee5059bcb9a..a636c114e3bd527adba6c9dc7582bcb95ce48262 100644
--- a/server/app/common/service/generator/stub/vue/search_item/datetime.stub
+++ b/server/app/common/service/generator/stub/vue/search_item/datetime.stub
@@ -1,8 +1,7 @@
 <el-form-item label="{COLUMN_COMMENT}" prop="{COLUMN_NAME}" label-width="100px">
     <div class="w-[215px]">
-        <daterange-picker
-            v-model:startTime="queryParams.start_time"
-            v-model:endTime="queryParams.end_time"
+        <datetimerange-picker
+            v-model:startAndEndTime="queryParams.{COLUMN_NAME}"
         />
     </div>
 </el-form-item>
\ No newline at end of file
diff --git a/server/app/common/service/generator/stub/vue/search_item/datetime2.stub b/server/app/common/service/generator/stub/vue/search_item/datetime2.stub
index 56710677669021ecd38df5dc7f980f70db6e39fd..0d536ba500af8dfa8da32d56fe3f7ee5059bcb9a 100644
--- a/server/app/common/service/generator/stub/vue/search_item/datetime2.stub
+++ b/server/app/common/service/generator/stub/vue/search_item/datetime2.stub
@@ -1,6 +1,6 @@
 <el-form-item label="{COLUMN_COMMENT}" prop="{COLUMN_NAME}" label-width="100px">
     <div class="w-[215px]">
-        <datetimerange-picker
+        <daterange-picker
             v-model:startTime="queryParams.start_time"
             v-model:endTime="queryParams.end_time"
         />