Merge branch 'master' of http://47.115.223.229:8888/yangjun/dbsd_tjbbfx

jeecgboot-vue3/src/views/bl/blStuInfo/BlStuInfoList.vue

@@ -26,7 +26,7 @@
       <template #tableTitle>
         <!-- <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button> -->
         <a-button type="primary" @click="handleV2Add" preIcon="ant-design:plus-outlined"> 新增</a-button>
-        <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 下载导入模板</a-button>
+        <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 下载模板</a-button>
         <!-- <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button> -->
         <a-switch hidden v-model:checked="reloadCreateBtn" checked-children="显示" un-checked-children="不显示"/>
       </template>
@@ -228,7 +228,7 @@ const $message = useMessage();
       {
         ifShow: reloadCreateBtn.value,
         label: '重新生成',
-        onClick: reloadCreateFn.bind(null, record),
+        onClick: reloadCreateFn.bind(null, { id: record.id }),
       },
       {
         label: '删除',

jeecgboot-vue3/src/views/bl/blStuInfo/components/BlStuInfoV2Form.vue

@@ -9,9 +9,9 @@
       <div v-if="current == 0" style="padding: 20px;">
         <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-row>
-            <a-col :span="24" class="shuoming">
+            <!-- <a-col :span="24" class="shuoming">
               <span>请注意：点击后不可返回修改信息，请仔细填写！</span>
-            </a-col>
+            </a-col> -->
             <a-col :span="24">
               <a-form-item label="学校名称" v-bind="validateInfos.schoolName">
                 <a-input v-model:value="formData.schoolName" placeholder="请输入学校名称" ></a-input>

jeecgboot-vue3/src/views/bl/blTeacherInfo/BlTeacherInfoList.vue

@@ -228,7 +228,7 @@ const $message = useMessage();
       {
         ifShow: reloadCreateBtn.value,
         label: '重新生成',
-        onClick: reloadCreateFn.bind(null, record),
+        onClick: reloadCreateFn.bind(null, { id: record.id }),
       },
       {
         label: '删除',