From 5bfb8098d6cfffae442f38099dab0569223344d5 Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Mon, 30 Oct 2023 18:15:22 +0800
Subject: [PATCH 1/2] fix: vben codegen

---
 .../resources/codegen/vue3_vben/api/api.ts.vm |  2 +-
 .../codegen/vue3_vben/views/index.vue.vm      | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben/api/api.ts.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben/api/api.ts.vm
index 5ab06f577..b7f26510e 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben/api/api.ts.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben/api/api.ts.vm
@@ -1,4 +1,4 @@
-import {defHttp} from '@/utils/http/axios'
+import { defHttp } from '@/utils/http/axios'
 #set ($baseURL = "/${table.moduleName}/${simpleClassName_strikeCase}")
 
 // 查询${table.classComment}列表
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben/views/index.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben/views/index.vue.vm
index f8bcdd865..7f794585c 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben/views/index.vue.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben/views/index.vue.vm
@@ -1,10 +1,11 @@
 <script lang="ts" setup>
-  import {columns, searchFormSchema} from './'
-  import {useI18n} from '@/hooks/web/useI18n'
-  import {useMessage} from '@/hooks/web/useMessage'
-  import {useModal} from '@/components/Modal'
-  import {useTable} from '@/components/Table'
-  import { delete${ simpleClassName }, export${ simpleClassName }, get${ simpleClassName } Page } from '@/api/${table.moduleName}/${classNameVar}'
+import ${simpleClassName}Modal from './${simpleClassName}Modal.vue'
+import { columns, searchFormSchema } from './${classNameVar}.data'
+import { useI18n } from '@/hooks/web/useI18n'
+import { useMessage } from '@/hooks/web/useMessage'
+import { useModal } from '@/components/Modal'
+import { useTable } from '@/components/Table'
+import { delete${simpleClassName}, export${simpleClassName}, get${simpleClassName}Page } from '@/api/${table.moduleName}/${classNameVar}'
 
 defineOptions({ name: '${table.className}' })
 
@@ -14,7 +15,7 @@ const [registerModal, { openModal }] = useModal()
 
 const [registerTable, { getForm, reload }] = useTable({
   title: '${table.classComment}列表',
-  api: get${ simpleClassName }Page,
+  api: get${simpleClassName}Page,
     columns,
     formConfig: { labelWidth: 120, schemas: searchFormSchema },
     useSearchForm: true,
@@ -41,14 +42,14 @@ async function handleExport() {
     iconType: 'warning',
     content: t('common.exportMessage'),
     async onOk() {
-      await export${ simpleClassName } (getForm().getFieldsValue())
+      await export${simpleClassName}(getForm().getFieldsValue())
       createMessage.success(t('common.exportSuccessText'))
     },
   })
 }
 
 async function handleDelete(record: Recordable) {
-  await delete${ simpleClassName } (record.id)
+  await delete${simpleClassName}(record.id)
   createMessage.success(t('common.delSuccessText'))
   reload()
 }

From 7767a8f8378bf4d9eb36c5dde128684f1ee44789 Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Mon, 30 Oct 2023 18:17:17 +0800
Subject: [PATCH 2/2] chore: up mybatis-plus-join 1.4.7

---
 yudao-dependencies/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml
index 4362d357c..e558536ff 100644
--- a/yudao-dependencies/pom.xml
+++ b/yudao-dependencies/pom.xml
@@ -27,7 +27,7 @@
         <mybatis-plus.version>3.5.4</mybatis-plus.version>
         <mybatis-plus-generator.version>3.5.4</mybatis-plus-generator.version>
         <dynamic-datasource.version>3.6.1</dynamic-datasource.version>
-        <mybatis-plus-join.version>1.4.6</mybatis-plus-join.version>
+        <mybatis-plus-join.version>1.4.7</mybatis-plus-join.version>
         <redisson.version>3.18.0</redisson.version>
         <dm8.jdbc.version>8.1.3.62</dm8.jdbc.version>
         <!-- 服务保障相关 -->