From e61776839cdbddcfbdcd60274d5a76aa937d993c Mon Sep 17 00:00:00 2001
From: jiangdingxuan <jiangdingxuan@rzdata.net>
Date: Tue, 9 Jan 2024 15:43:24 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E3=80=81Excel=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/SysNoticeController.java           |  85 ---
 .../org/dromara/system/domain/SysNotice.java  |  51 --
 .../dromara/system/domain/bo/SysNoticeBo.java |  61 ---
 .../dromara/system/domain/vo/SysNoticeVo.java |  73 ---
 .../system/mapper/SysNoticeMapper.java        |  14 -
 .../system/service/ISysNoticeService.java     |  67 ---
 .../service/impl/SysNoticeServiceImpl.java    | 123 -----
 src/main/resources/excel/单列表.xlsx       | Bin 10787 -> 0 bytes
 src/main/resources/excel/多sheet列表.xlsx  | Bin 13359 -> 0 bytes
 src/main/resources/excel/多列表.xlsx       | Bin 10761 -> 0 bytes
 .../mapper/system/SysNoticeMapper.xml         |   7 -
 .../mapper/system/SysTenantMapper.xml         |   7 -
 .../mapper/system/SysTenantPackageMapper.xml  |   7 -
 src/main/resources/vm/java/bo.java.vm         |  50 --
 src/main/resources/vm/java/controller.java.vm | 115 ----
 src/main/resources/vm/java/domain.java.vm     |  60 ---
 src/main/resources/vm/java/mapper.java.vm     |  15 -
 src/main/resources/vm/java/service.java.vm    |  53 --
 .../resources/vm/java/serviceImpl.java.vm     | 134 -----
 src/main/resources/vm/java/vo.java.vm         |  59 ---
 src/main/resources/vm/sql/oracle/sql.vm       |  19 -
 src/main/resources/vm/sql/postgres/sql.vm     |  20 -
 src/main/resources/vm/sql/sql.vm              |  19 -
 src/main/resources/vm/sql/sqlserver/sql.vm    |  19 -
 src/main/resources/vm/ts/api.ts.vm            |  63 ---
 src/main/resources/vm/ts/types.ts.vm          |  58 --
 src/main/resources/vm/vue/index-tree.vue.vm   | 501 ------------------
 src/main/resources/vm/vue/index.vue.vm        | 468 ----------------
 src/main/resources/vm/xml/mapper.xml.vm       |   7 -
 29 files changed, 2155 deletions(-)
 delete mode 100644 src/main/java/org/dromara/system/controller/system/SysNoticeController.java
 delete mode 100644 src/main/java/org/dromara/system/domain/SysNotice.java
 delete mode 100644 src/main/java/org/dromara/system/domain/bo/SysNoticeBo.java
 delete mode 100644 src/main/java/org/dromara/system/domain/vo/SysNoticeVo.java
 delete mode 100644 src/main/java/org/dromara/system/mapper/SysNoticeMapper.java
 delete mode 100644 src/main/java/org/dromara/system/service/ISysNoticeService.java
 delete mode 100644 src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java
 delete mode 100644 src/main/resources/excel/单列表.xlsx
 delete mode 100644 src/main/resources/excel/多sheet列表.xlsx
 delete mode 100644 src/main/resources/excel/多列表.xlsx
 delete mode 100644 src/main/resources/mapper/system/SysNoticeMapper.xml
 delete mode 100644 src/main/resources/mapper/system/SysTenantMapper.xml
 delete mode 100644 src/main/resources/mapper/system/SysTenantPackageMapper.xml
 delete mode 100644 src/main/resources/vm/java/bo.java.vm
 delete mode 100644 src/main/resources/vm/java/controller.java.vm
 delete mode 100644 src/main/resources/vm/java/domain.java.vm
 delete mode 100644 src/main/resources/vm/java/mapper.java.vm
 delete mode 100644 src/main/resources/vm/java/service.java.vm
 delete mode 100644 src/main/resources/vm/java/serviceImpl.java.vm
 delete mode 100644 src/main/resources/vm/java/vo.java.vm
 delete mode 100644 src/main/resources/vm/sql/oracle/sql.vm
 delete mode 100644 src/main/resources/vm/sql/postgres/sql.vm
 delete mode 100644 src/main/resources/vm/sql/sql.vm
 delete mode 100644 src/main/resources/vm/sql/sqlserver/sql.vm
 delete mode 100644 src/main/resources/vm/ts/api.ts.vm
 delete mode 100644 src/main/resources/vm/ts/types.ts.vm
 delete mode 100644 src/main/resources/vm/vue/index-tree.vue.vm
 delete mode 100644 src/main/resources/vm/vue/index.vue.vm
 delete mode 100644 src/main/resources/vm/xml/mapper.xml.vm

diff --git a/src/main/java/org/dromara/system/controller/system/SysNoticeController.java b/src/main/java/org/dromara/system/controller/system/SysNoticeController.java
deleted file mode 100644
index e21825b..0000000
--- a/src/main/java/org/dromara/system/controller/system/SysNoticeController.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package org.dromara.system.controller.system;
-
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import lombok.RequiredArgsConstructor;
-import org.dromara.common.core.domain.R;
-import org.dromara.common.core.service.DictService;
-import org.dromara.common.mybatis.core.page.PageQuery;
-import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.common.web.core.BaseController;
-import org.dromara.common.websocket.utils.WebSocketUtils;
-import org.dromara.system.domain.bo.SysNoticeBo;
-import org.dromara.system.domain.vo.SysNoticeVo;
-import org.dromara.system.service.ISysNoticeService;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * 公告 信息操作处理
- *
- * @author Lion Li
- */
-@Validated
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/system/notice")
-public class SysNoticeController extends BaseController {
-
-    private final ISysNoticeService noticeService;
-    private final DictService dictService;
-
-    /**
-     * 获取通知公告列表
-     */
-    @SaCheckPermission("system:notice:list")
-    @GetMapping("/list")
-    public TableDataInfo<SysNoticeVo> list(SysNoticeBo notice, PageQuery pageQuery) {
-        return noticeService.selectPageNoticeList(notice, pageQuery);
-    }
-
-    /**
-     * 根据通知公告编号获取详细信息
-     *
-     * @param noticeId 公告ID
-     */
-    @SaCheckPermission("system:notice:query")
-    @GetMapping(value = "/{noticeId}")
-    public R<SysNoticeVo> getInfo(@PathVariable Long noticeId) {
-        return R.ok(noticeService.selectNoticeById(noticeId));
-    }
-
-    /**
-     * 新增通知公告
-     */
-    @SaCheckPermission("system:notice:add")
-    @PostMapping
-    public R<Void> add(@Validated @RequestBody SysNoticeBo notice) {
-        int rows = noticeService.insertNotice(notice);
-        if (rows <= 0) {
-            return R.fail();
-        }
-        String type = dictService.getDictLabel("sys_notice_type", notice.getNoticeType());
-        WebSocketUtils.publishAll("[" + type + "] " + notice.getNoticeTitle());
-        return R.ok();
-    }
-
-    /**
-     * 修改通知公告
-     */
-    @SaCheckPermission("system:notice:edit")
-    @PutMapping
-    public R<Void> edit(@Validated @RequestBody SysNoticeBo notice) {
-        return toAjax(noticeService.updateNotice(notice));
-    }
-
-    /**
-     * 删除通知公告
-     *
-     * @param noticeIds 公告ID串
-     */
-    @SaCheckPermission("system:notice:remove")
-    @DeleteMapping("/{noticeIds}")
-    public R<Void> remove(@PathVariable Long[] noticeIds) {
-        return toAjax(noticeService.deleteNoticeByIds(noticeIds));
-    }
-}
diff --git a/src/main/java/org/dromara/system/domain/SysNotice.java b/src/main/java/org/dromara/system/domain/SysNotice.java
deleted file mode 100644
index 9ef00a4..0000000
--- a/src/main/java/org/dromara/system/domain/SysNotice.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.dromara.system.domain;
-
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.dromara.common.mybatis.core.domain.BaseEntity;
-
-
-/**
- * 通知公告表 sys_notice
- *
- * @author Lion Li
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("sys_notice")
-public class SysNotice extends BaseEntity {
-
-    /**
-     * 公告ID
-     */
-    @TableId(value = "notice_id")
-    private Long noticeId;
-
-    /**
-     * 公告标题
-     */
-    private String noticeTitle;
-
-    /**
-     * 公告类型（1通知 2公告）
-     */
-    private String noticeType;
-
-    /**
-     * 公告内容
-     */
-    private String noticeContent;
-
-    /**
-     * 公告状态（0正常 1关闭）
-     */
-    private String status;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-}
diff --git a/src/main/java/org/dromara/system/domain/bo/SysNoticeBo.java b/src/main/java/org/dromara/system/domain/bo/SysNoticeBo.java
deleted file mode 100644
index cdcc575..0000000
--- a/src/main/java/org/dromara/system/domain/bo/SysNoticeBo.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.dromara.system.domain.bo;
-
-import io.github.linpeilie.annotations.AutoMapper;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Size;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.dromara.common.core.xss.Xss;
-import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.system.domain.SysNotice;
-
-/**
- * 通知公告业务对象 sys_notice
- *
- * @author Michelle.Chung
- */
-
-@Data
-@EqualsAndHashCode(callSuper = true)
-@AutoMapper(target = SysNotice.class, reverseConvertGenerate = false)
-public class SysNoticeBo extends BaseEntity {
-
-    /**
-     * 公告ID
-     */
-    private Long noticeId;
-
-    /**
-     * 公告标题
-     */
-    @Xss(message = "公告标题不能包含脚本字符")
-    @NotBlank(message = "公告标题不能为空")
-    @Size(min = 0, max = 50, message = "公告标题不能超过{max}个字符")
-    private String noticeTitle;
-
-    /**
-     * 公告类型（1通知 2公告）
-     */
-    private String noticeType;
-
-    /**
-     * 公告内容
-     */
-    private String noticeContent;
-
-    /**
-     * 公告状态（0正常 1关闭）
-     */
-    private String status;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 创建人名称
-     */
-    private String createByName;
-
-}
diff --git a/src/main/java/org/dromara/system/domain/vo/SysNoticeVo.java b/src/main/java/org/dromara/system/domain/vo/SysNoticeVo.java
deleted file mode 100644
index afe7367..0000000
--- a/src/main/java/org/dromara/system/domain/vo/SysNoticeVo.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package org.dromara.system.domain.vo;
-
-import org.dromara.common.translation.annotation.Translation;
-import org.dromara.common.translation.constant.TransConstant;
-import org.dromara.system.domain.SysNotice;
-import io.github.linpeilie.annotations.AutoMapper;
-import lombok.Data;
-
-import java.io.Serial;
-import java.io.Serializable;
-import java.util.Date;
-
-
-
-/**
- * 通知公告视图对象 sys_notice
- *
- * @author Michelle.Chung
- */
-@Data
-@AutoMapper(target = SysNotice.class)
-public class SysNoticeVo implements Serializable {
-
-    @Serial
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 公告ID
-     */
-    private Long noticeId;
-
-    /**
-     * 公告标题
-     */
-    private String noticeTitle;
-
-    /**
-     * 公告类型（1通知 2公告）
-     */
-    private String noticeType;
-
-    /**
-     * 公告内容
-     */
-    private String noticeContent;
-
-    /**
-     * 公告状态（0正常 1关闭）
-     */
-    private String status;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 创建者
-     */
-    private Long createBy;
-
-    /**
-     * 创建人名称
-     */
-    @Translation(type = TransConstant.USER_ID_TO_NAME, mapper = "createBy")
-    private String createByName;
-
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-
-}
diff --git a/src/main/java/org/dromara/system/mapper/SysNoticeMapper.java b/src/main/java/org/dromara/system/mapper/SysNoticeMapper.java
deleted file mode 100644
index 1e27b77..0000000
--- a/src/main/java/org/dromara/system/mapper/SysNoticeMapper.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.dromara.system.mapper;
-
-import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
-import org.dromara.system.domain.SysNotice;
-import org.dromara.system.domain.vo.SysNoticeVo;
-
-/**
- * 通知公告表 数据层
- *
- * @author Lion Li
- */
-public interface SysNoticeMapper extends BaseMapperPlus<SysNotice, SysNoticeVo> {
-
-}
diff --git a/src/main/java/org/dromara/system/service/ISysNoticeService.java b/src/main/java/org/dromara/system/service/ISysNoticeService.java
deleted file mode 100644
index 8ec999d..0000000
--- a/src/main/java/org/dromara/system/service/ISysNoticeService.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.dromara.system.service;
-
-import org.dromara.common.mybatis.core.page.PageQuery;
-import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.system.domain.bo.SysNoticeBo;
-import org.dromara.system.domain.vo.SysNoticeVo;
-
-import java.util.List;
-
-/**
- * 公告 服务层
- *
- * @author Lion Li
- */
-public interface ISysNoticeService {
-
-
-    TableDataInfo<SysNoticeVo> selectPageNoticeList(SysNoticeBo notice, PageQuery pageQuery);
-
-    /**
-     * 查询公告信息
-     *
-     * @param noticeId 公告ID
-     * @return 公告信息
-     */
-    SysNoticeVo selectNoticeById(Long noticeId);
-
-    /**
-     * 查询公告列表
-     *
-     * @param notice 公告信息
-     * @return 公告集合
-     */
-    List<SysNoticeVo> selectNoticeList(SysNoticeBo notice);
-
-    /**
-     * 新增公告
-     *
-     * @param bo 公告信息
-     * @return 结果
-     */
-    int insertNotice(SysNoticeBo bo);
-
-    /**
-     * 修改公告
-     *
-     * @param bo 公告信息
-     * @return 结果
-     */
-    int updateNotice(SysNoticeBo bo);
-
-    /**
-     * 删除公告信息
-     *
-     * @param noticeId 公告ID
-     * @return 结果
-     */
-    int deleteNoticeById(Long noticeId);
-
-    /**
-     * 批量删除公告信息
-     *
-     * @param noticeIds 需要删除的公告ID
-     * @return 结果
-     */
-    int deleteNoticeByIds(Long[] noticeIds);
-}
diff --git a/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java b/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java
deleted file mode 100644
index 8e2b5ac..0000000
--- a/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package org.dromara.system.service.impl;
-
-import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.dromara.common.core.utils.MapstructUtils;
-import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.mybatis.core.page.PageQuery;
-import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.system.domain.SysNotice;
-import org.dromara.system.domain.bo.SysNoticeBo;
-import org.dromara.system.domain.vo.SysNoticeVo;
-import org.dromara.system.domain.vo.SysUserVo;
-import org.dromara.system.mapper.SysNoticeMapper;
-import org.dromara.system.mapper.SysUserMapper;
-import org.dromara.system.service.ISysNoticeService;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * 公告 服务层实现
- *
- * @author Lion Li
- */
-@RequiredArgsConstructor
-@Service
-public class SysNoticeServiceImpl implements ISysNoticeService {
-
-    private final SysNoticeMapper baseMapper;
-    private final SysUserMapper userMapper;
-
-    @Override
-    public TableDataInfo<SysNoticeVo> selectPageNoticeList(SysNoticeBo notice, PageQuery pageQuery) {
-        LambdaQueryWrapper<SysNotice> lqw = buildQueryWrapper(notice);
-        Page<SysNoticeVo> page = baseMapper.selectVoPage(pageQuery.build(), lqw);
-        return TableDataInfo.build(page);
-    }
-
-    /**
-     * 查询公告信息
-     *
-     * @param noticeId 公告ID
-     * @return 公告信息
-     */
-    @Override
-    public SysNoticeVo selectNoticeById(Long noticeId) {
-        return baseMapper.selectVoById(noticeId);
-    }
-
-    /**
-     * 查询公告列表
-     *
-     * @param notice 公告信息
-     * @return 公告集合
-     */
-    @Override
-    public List<SysNoticeVo> selectNoticeList(SysNoticeBo notice) {
-        LambdaQueryWrapper<SysNotice> lqw = buildQueryWrapper(notice);
-        return baseMapper.selectVoList(lqw);
-    }
-
-    private LambdaQueryWrapper<SysNotice> buildQueryWrapper(SysNoticeBo bo) {
-        LambdaQueryWrapper<SysNotice> lqw = Wrappers.lambdaQuery();
-        lqw.like(StringUtils.isNotBlank(bo.getNoticeTitle()), SysNotice::getNoticeTitle, bo.getNoticeTitle());
-        lqw.eq(StringUtils.isNotBlank(bo.getNoticeType()), SysNotice::getNoticeType, bo.getNoticeType());
-        if (StringUtils.isNotBlank(bo.getCreateByName())) {
-            SysUserVo sysUser = userMapper.selectUserByUserName(bo.getCreateByName());
-            lqw.eq(SysNotice::getCreateBy, ObjectUtil.isNotNull(sysUser) ? sysUser.getUserId() : null);
-        }
-        lqw.orderByAsc(SysNotice::getNoticeId);
-        return lqw;
-    }
-
-    /**
-     * 新增公告
-     *
-     * @param bo 公告信息
-     * @return 结果
-     */
-    @Override
-    public int insertNotice(SysNoticeBo bo) {
-        SysNotice notice = MapstructUtils.convert(bo, SysNotice.class);
-        return baseMapper.insert(notice);
-    }
-
-    /**
-     * 修改公告
-     *
-     * @param bo 公告信息
-     * @return 结果
-     */
-    @Override
-    public int updateNotice(SysNoticeBo bo) {
-        SysNotice notice = MapstructUtils.convert(bo, SysNotice.class);
-        return baseMapper.updateById(notice);
-    }
-
-    /**
-     * 删除公告对象
-     *
-     * @param noticeId 公告ID
-     * @return 结果
-     */
-    @Override
-    public int deleteNoticeById(Long noticeId) {
-        return baseMapper.deleteById(noticeId);
-    }
-
-    /**
-     * 批量删除公告信息
-     *
-     * @param noticeIds 需要删除的公告ID
-     * @return 结果
-     */
-    @Override
-    public int deleteNoticeByIds(Long[] noticeIds) {
-        return baseMapper.deleteBatchIds(Arrays.asList(noticeIds));
-    }
-}
diff --git a/src/main/resources/excel/单列表.xlsx b/src/main/resources/excel/单列表.xlsx
deleted file mode 100644
index 0f7347d652c06ae29eca9fa6cd1055ec6ae6c6e3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10787
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
Dz6h21

diff --git a/src/main/resources/excel/多sheet列表.xlsx b/src/main/resources/excel/多sheet列表.xlsx
deleted file mode 100644
index 5277f2eaf95a0e36e1d04faeaa0217eec5f061a6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13359
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
Qp#!+Ua?q8Z6KlYK0p&Bw+W-In

diff --git a/src/main/resources/excel/多列表.xlsx b/src/main/resources/excel/多列表.xlsx
deleted file mode 100644
index c7d11dcce51c7ebc9237827cd6caac0d4b474012..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10761
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
GzyAY;y@`_m

diff --git a/src/main/resources/mapper/system/SysNoticeMapper.xml b/src/main/resources/mapper/system/SysNoticeMapper.xml
deleted file mode 100644
index 43f494d..0000000
--- a/src/main/resources/mapper/system/SysNoticeMapper.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.system.mapper.SysNoticeMapper">
-
-</mapper>
diff --git a/src/main/resources/mapper/system/SysTenantMapper.xml b/src/main/resources/mapper/system/SysTenantMapper.xml
deleted file mode 100644
index 0d96e13..0000000
--- a/src/main/resources/mapper/system/SysTenantMapper.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.system.mapper.SysTenantMapper">
-
-</mapper>
diff --git a/src/main/resources/mapper/system/SysTenantPackageMapper.xml b/src/main/resources/mapper/system/SysTenantPackageMapper.xml
deleted file mode 100644
index 79cf4c5..0000000
--- a/src/main/resources/mapper/system/SysTenantPackageMapper.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.system.mapper.SysTenantPackageMapper">
-
-</mapper>
diff --git a/src/main/resources/vm/java/bo.java.vm b/src/main/resources/vm/java/bo.java.vm
deleted file mode 100644
index 511d37c..0000000
--- a/src/main/resources/vm/java/bo.java.vm
+++ /dev/null
@@ -1,50 +0,0 @@
-package ${packageName}.domain.bo;
-
-import ${packageName}.domain.${ClassName};
-import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.common.core.validate.AddGroup;
-import org.dromara.common.core.validate.EditGroup;
-import io.github.linpeilie.annotations.AutoMapper;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import jakarta.validation.constraints.*;
-#foreach ($import in $importList)
-import ${import};
-#end
-
-/**
- * ${functionName}业务对象 ${tableName}
- *
- * @author ${author}
- * @date ${datetime}
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@AutoMapper(target = ${ClassName}.class, reverseConvertGenerate = false)
-public class ${ClassName}Bo extends BaseEntity {
-
-#foreach ($column in $columns)
-#if(!$table.isSuperColumn($column.javaField) && ($column.query || $column.insert || $column.edit))
-    /**
-     * $column.columnComment
-     */
-#if($column.insert && $column.edit)
-#set($Group="AddGroup.class, EditGroup.class")
-#elseif($column.insert)
-#set($Group="AddGroup.class")
-#elseif($column.edit)
-#set($Group="EditGroup.class")
-#end
-#if($column.required)
-#if($column.javaType == 'String')
-    @NotBlank(message = "$column.columnComment不能为空", groups = { $Group })
-#else
-    @NotNull(message = "$column.columnComment不能为空", groups = { $Group })
-#end
-#end
-    private $column.javaType $column.javaField;
-
-#end
-#end
-
-}
diff --git a/src/main/resources/vm/java/controller.java.vm b/src/main/resources/vm/java/controller.java.vm
deleted file mode 100644
index 14177b5..0000000
--- a/src/main/resources/vm/java/controller.java.vm
+++ /dev/null
@@ -1,115 +0,0 @@
-package ${packageName}.controller;
-
-import java.util.List;
-
-import lombok.RequiredArgsConstructor;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.validation.constraints.*;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import org.dromara.common.idempotent.annotation.RepeatSubmit;
-import org.dromara.common.log.annotation.Log;
-import org.dromara.common.web.core.BaseController;
-import org.dromara.common.mybatis.core.page.PageQuery;
-import org.dromara.common.core.domain.R;
-import org.dromara.common.core.validate.AddGroup;
-import org.dromara.common.core.validate.EditGroup;
-import org.dromara.common.log.enums.BusinessType;
-import org.dromara.common.excel.utils.ExcelUtil;
-import ${packageName}.domain.vo.${ClassName}Vo;
-import ${packageName}.domain.bo.${ClassName}Bo;
-import ${packageName}.service.I${ClassName}Service;
-#if($table.crud || $table.sub)
-import org.dromara.common.mybatis.core.page.TableDataInfo;
-#elseif($table.tree)
-#end
-
-/**
- * ${functionName}
- *
- * @author ${author}
- * @date ${datetime}
- */
-@Validated
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/${moduleName}/${businessName}")
-public class ${ClassName}Controller extends BaseController {
-
-    private final I${ClassName}Service ${className}Service;
-
-    /**
-     * 查询${functionName}列表
-     */
-    @SaCheckPermission("${permissionPrefix}:list")
-    @GetMapping("/list")
-#if($table.crud || $table.sub)
-    public TableDataInfo<${ClassName}Vo> list(${ClassName}Bo bo, PageQuery pageQuery) {
-        return ${className}Service.queryPageList(bo, pageQuery);
-    }
-#elseif($table.tree)
-    public R<List<${ClassName}Vo>> list(${ClassName}Bo bo) {
-        List<${ClassName}Vo> list = ${className}Service.queryList(bo);
-        return R.ok(list);
-    }
-#end
-
-    /**
-     * 导出${functionName}列表
-     */
-    @SaCheckPermission("${permissionPrefix}:export")
-    @Log(title = "${functionName}", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(${ClassName}Bo bo, HttpServletResponse response) {
-        List<${ClassName}Vo> list = ${className}Service.queryList(bo);
-        ExcelUtil.exportExcel(list, "${functionName}", ${ClassName}Vo.class, response);
-    }
-
-    /**
-     * 获取${functionName}详细信息
-     *
-     * @param ${pkColumn.javaField} 主键
-     */
-    @SaCheckPermission("${permissionPrefix}:query")
-    @GetMapping("/{${pkColumn.javaField}}")
-    public R<${ClassName}Vo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable ${pkColumn.javaType} ${pkColumn.javaField}) {
-        return R.ok(${className}Service.queryById(${pkColumn.javaField}));
-    }
-
-    /**
-     * 新增${functionName}
-     */
-    @SaCheckPermission("${permissionPrefix}:add")
-    @Log(title = "${functionName}", businessType = BusinessType.INSERT)
-    @RepeatSubmit()
-    @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody ${ClassName}Bo bo) {
-        return toAjax(${className}Service.insertByBo(bo));
-    }
-
-    /**
-     * 修改${functionName}
-     */
-    @SaCheckPermission("${permissionPrefix}:edit")
-    @Log(title = "${functionName}", businessType = BusinessType.UPDATE)
-    @RepeatSubmit()
-    @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ${ClassName}Bo bo) {
-        return toAjax(${className}Service.updateByBo(bo));
-    }
-
-    /**
-     * 删除${functionName}
-     *
-     * @param ${pkColumn.javaField}s 主键串
-     */
-    @SaCheckPermission("${permissionPrefix}:remove")
-    @Log(title = "${functionName}", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{${pkColumn.javaField}s}")
-    public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s) {
-        return toAjax(${className}Service.deleteWithValidByIds(List.of(${pkColumn.javaField}s), true));
-    }
-}
diff --git a/src/main/resources/vm/java/domain.java.vm b/src/main/resources/vm/java/domain.java.vm
deleted file mode 100644
index 205fb73..0000000
--- a/src/main/resources/vm/java/domain.java.vm
+++ /dev/null
@@ -1,60 +0,0 @@
-package ${packageName}.domain;
-
-#foreach ($column in $columns)
-#if($column.javaField=='tenantId')
-#set($IsTenant=1)
-#end
-#end
-#if($IsTenant==1)
-import org.dromara.common.tenant.core.TenantEntity;
-#else
-import org.dromara.common.mybatis.core.domain.BaseEntity;
-#end
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-#foreach ($import in $importList)
-import ${import};
-#end
-
-import java.io.Serial;
-
-/**
- * ${functionName}对象 ${tableName}
- *
- * @author ${author}
- * @date ${datetime}
- */
-#if($IsTenant==1)
-#set($Entity="TenantEntity")
-#else
-#set($Entity="BaseEntity")
-#end
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("${tableName}")
-public class ${ClassName} extends ${Entity} {
-
-    @Serial
-    private static final long serialVersionUID = 1L;
-
-#foreach ($column in $columns)
-#if(!$table.isSuperColumn($column.javaField))
-    /**
-     * $column.columnComment
-     */
-#if($column.javaField=='delFlag')
-    @TableLogic
-#end
-#if($column.javaField=='version')
-    @Version
-#end
-#if($column.isPk==1)
-    @TableId(value = "$column.columnName")
-#end
-    private $column.javaType $column.javaField;
-
-#end
-#end
-
-}
diff --git a/src/main/resources/vm/java/mapper.java.vm b/src/main/resources/vm/java/mapper.java.vm
deleted file mode 100644
index 0922401..0000000
--- a/src/main/resources/vm/java/mapper.java.vm
+++ /dev/null
@@ -1,15 +0,0 @@
-package ${packageName}.mapper;
-
-import ${packageName}.domain.${ClassName};
-import ${packageName}.domain.vo.${ClassName}Vo;
-import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
-
-/**
- * ${functionName}Mapper接口
- *
- * @author ${author}
- * @date ${datetime}
- */
-public interface ${ClassName}Mapper extends BaseMapperPlus<${ClassName}, ${ClassName}Vo> {
-
-}
diff --git a/src/main/resources/vm/java/service.java.vm b/src/main/resources/vm/java/service.java.vm
deleted file mode 100644
index d596a0e..0000000
--- a/src/main/resources/vm/java/service.java.vm
+++ /dev/null
@@ -1,53 +0,0 @@
-package ${packageName}.service;
-
-import ${packageName}.domain.${ClassName};
-import ${packageName}.domain.vo.${ClassName}Vo;
-import ${packageName}.domain.bo.${ClassName}Bo;
-#if($table.crud || $table.sub)
-import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.common.mybatis.core.page.PageQuery;
-#end
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * ${functionName}Service接口
- *
- * @author ${author}
- * @date ${datetime}
- */
-public interface I${ClassName}Service {
-
-    /**
-     * 查询${functionName}
-     */
-    ${ClassName}Vo queryById(${pkColumn.javaType} ${pkColumn.javaField});
-
-#if($table.crud || $table.sub)
-    /**
-     * 查询${functionName}列表
-     */
-    TableDataInfo<${ClassName}Vo> queryPageList(${ClassName}Bo bo, PageQuery pageQuery);
-#end
-
-    /**
-     * 查询${functionName}列表
-     */
-    List<${ClassName}Vo> queryList(${ClassName}Bo bo);
-
-    /**
-     * 新增${functionName}
-     */
-    Boolean insertByBo(${ClassName}Bo bo);
-
-    /**
-     * 修改${functionName}
-     */
-    Boolean updateByBo(${ClassName}Bo bo);
-
-    /**
-     * 校验并批量删除${functionName}信息
-     */
-    Boolean deleteWithValidByIds(Collection<${pkColumn.javaType}> ids, Boolean isValid);
-}
diff --git a/src/main/resources/vm/java/serviceImpl.java.vm b/src/main/resources/vm/java/serviceImpl.java.vm
deleted file mode 100644
index 75a9b83..0000000
--- a/src/main/resources/vm/java/serviceImpl.java.vm
+++ /dev/null
@@ -1,134 +0,0 @@
-package ${packageName}.service.impl;
-
-import org.dromara.common.core.utils.MapstructUtils;
-import org.dromara.common.core.utils.StringUtils;
-#if($table.crud || $table.sub)
-import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.common.mybatis.core.page.PageQuery;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-#end
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import ${packageName}.domain.bo.${ClassName}Bo;
-import ${packageName}.domain.vo.${ClassName}Vo;
-import ${packageName}.domain.${ClassName};
-import ${packageName}.mapper.${ClassName}Mapper;
-import ${packageName}.service.I${ClassName}Service;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Collection;
-
-/**
- * ${functionName}Service业务层处理
- *
- * @author ${author}
- * @date ${datetime}
- */
-@RequiredArgsConstructor
-@Service
-public class ${ClassName}ServiceImpl implements I${ClassName}Service {
-
-    private final ${ClassName}Mapper baseMapper;
-
-    /**
-     * 查询${functionName}
-     */
-    @Override
-    public ${ClassName}Vo queryById(${pkColumn.javaType} ${pkColumn.javaField}){
-        return baseMapper.selectVoById(${pkColumn.javaField});
-    }
-
-#if($table.crud || $table.sub)
-    /**
-     * 查询${functionName}列表
-     */
-    @Override
-    public TableDataInfo<${ClassName}Vo> queryPageList(${ClassName}Bo bo, PageQuery pageQuery) {
-        LambdaQueryWrapper<${ClassName}> lqw = buildQueryWrapper(bo);
-        Page<${ClassName}Vo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
-        return TableDataInfo.build(result);
-    }
-#end
-
-    /**
-     * 查询${functionName}列表
-     */
-    @Override
-    public List<${ClassName}Vo> queryList(${ClassName}Bo bo) {
-        LambdaQueryWrapper<${ClassName}> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
-    }
-
-    private LambdaQueryWrapper<${ClassName}> buildQueryWrapper(${ClassName}Bo bo) {
-        Map<String, Object> params = bo.getParams();
-        LambdaQueryWrapper<${ClassName}> lqw = Wrappers.lambdaQuery();
-#foreach($column in $columns)
-#if($column.query)
-#set($queryType=$column.queryType)
-#set($javaField=$column.javaField)
-#set($javaType=$column.javaType)
-#set($columnName=$column.columnName)
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-#set($mpMethod=$column.queryType.toLowerCase())
-#if($queryType != 'BETWEEN')
-#if($javaType == 'String')
-#set($condition='StringUtils.isNotBlank(bo.get'+$AttrName+'())')
-#else
-#set($condition='bo.get'+$AttrName+'() != null')
-#end
-        lqw.$mpMethod($condition, ${ClassName}::get$AttrName, bo.get$AttrName());
-#else
-        lqw.between(params.get("begin$AttrName") != null && params.get("end$AttrName") != null,
-            ${ClassName}::get$AttrName ,params.get("begin$AttrName"), params.get("end$AttrName"));
-#end
-#end
-#end
-        return lqw;
-    }
-
-    /**
-     * 新增${functionName}
-     */
-    @Override
-    public Boolean insertByBo(${ClassName}Bo bo) {
-        ${ClassName} add = MapstructUtils.convert(bo, ${ClassName}.class);
-        validEntityBeforeSave(add);
-        boolean flag = baseMapper.insert(add) > 0;
-#set($pk=$pkColumn.javaField.substring(0,1).toUpperCase() + ${pkColumn.javaField.substring(1)})
-        if (flag) {
-            bo.set$pk(add.get$pk());
-        }
-        return flag;
-    }
-
-    /**
-     * 修改${functionName}
-     */
-    @Override
-    public Boolean updateByBo(${ClassName}Bo bo) {
-        ${ClassName} update = MapstructUtils.convert(bo, ${ClassName}.class);
-        validEntityBeforeSave(update);
-        return baseMapper.updateById(update) > 0;
-    }
-
-    /**
-     * 保存前的数据校验
-     */
-    private void validEntityBeforeSave(${ClassName} entity){
-        //TODO 做一些数据校验,如唯一约束
-    }
-
-    /**
-     * 批量删除${functionName}
-     */
-    @Override
-    public Boolean deleteWithValidByIds(Collection<${pkColumn.javaType}> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
-        }
-        return baseMapper.deleteBatchIds(ids) > 0;
-    }
-}
diff --git a/src/main/resources/vm/java/vo.java.vm b/src/main/resources/vm/java/vo.java.vm
deleted file mode 100644
index f99a2ed..0000000
--- a/src/main/resources/vm/java/vo.java.vm
+++ /dev/null
@@ -1,59 +0,0 @@
-package ${packageName}.domain.vo;
-
-#foreach ($import in $importList)
-import ${import};
-#end
-import ${packageName}.domain.${ClassName};
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import org.dromara.common.excel.annotation.ExcelDictFormat;
-import org.dromara.common.excel.convert.ExcelDictConvert;
-import io.github.linpeilie.annotations.AutoMapper;
-import lombok.Data;
-
-import java.io.Serial;
-import java.io.Serializable;
-import java.util.Date;
-
-
-
-/**
- * ${functionName}视图对象 ${tableName}
- *
- * @author ${author}
- * @date ${datetime}
- */
-@Data
-@ExcelIgnoreUnannotated
-@AutoMapper(target = ${ClassName}.class)
-public class ${ClassName}Vo implements Serializable {
-
-    @Serial
-    private static final long serialVersionUID = 1L;
-
-#foreach ($column in $columns)
-#if($column.list)
-    /**
-     * $column.columnComment
-     */
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if(${column.dictType} && ${column.dictType} != '')
-    @ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "${column.dictType}")
-#elseif($parentheseIndex != -1)
-    @ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "$column.readConverterExp()")
-#else
-    @ExcelProperty(value = "${comment}")
-#end
-    private $column.javaType $column.javaField;
-
-#end
-#end
-
-}
diff --git a/src/main/resources/vm/sql/oracle/sql.vm b/src/main/resources/vm/sql/oracle/sql.vm
deleted file mode 100644
index f6638be..0000000
--- a/src/main/resources/vm/sql/oracle/sql.vm
+++ /dev/null
@@ -1,19 +0,0 @@
--- 菜单 SQL
-insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
-values(${table.menuIds[0]}, '${functionName}', '${parentMenuId}', '1', '${businessName}', '${moduleName}/${businessName}/index', 1, 0, 'C', '0', '0', '${permissionPrefix}:list', '#', 103, 1, sysdate, null, null, '${functionName}菜单');
-
--- 按钮 SQL
-insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
-values(${table.menuIds[1]}, '${functionName}查询', ${table.menuIds[0]}, '1',  '#', '', 1,  0, 'F', '0', '0', '${permissionPrefix}:query',        '#', 103, 1, sysdate, null, null, '');
-
-insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
-values(${table.menuIds[2]}, '${functionName}新增', ${table.menuIds[0]}, '2',  '#', '', 1,  0, 'F', '0', '0', '${permissionPrefix}:add',          '#', 103, 1, sysdate, null, null, '');
-
-insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
-values(${table.menuIds[3]}, '${functionName}修改', ${table.menuIds[0]}, '3',  '#', '', 1,  0, 'F', '0', '0', '${permissionPrefix}:edit',         '#', 103, 1, sysdate, null, null, '');
-
-insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
-values(${table.menuIds[4]}, '${functionName}删除', ${table.menuIds[0]}, '4',  '#', '', 1,  0, 'F', '0', '0', '${permissionPrefix}:remove',       '#', 103, 1, sysdate, null, null, '');
-
-insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
-values(${table.menuIds[5]}, '${functionName}导出', ${table.menuIds[0]}, '5',  '#', '', 1,  0, 'F', '0', '0', '${permissionPrefix}:export',       '#', 103, 1, sysdate, null, null, '');
diff --git a/src/main/resources/vm/sql/postgres/sql.vm b/src/main/resources/vm/sql/postgres/sql.vm
deleted file mode 100644
index 0923392..0000000
--- a/src/main/resources/vm/sql/postgres/sql.vm
+++ /dev/null
@@ -1,20 +0,0 @@
--- 菜单 SQL
-insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
-values(${table.menuIds[0]}, '${functionName}', '${parentMenuId}', '1', '${businessName}', '${moduleName}/${businessName}/index', 1, 0, 'C', '0', '0', '${permissionPrefix}:list', '#', 103, 1, now(), null, null, '${functionName}菜单');
-
--- 按钮 SQL
-insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
-values(${table.menuIds[1]}, '${functionName}查询', ${table.menuIds[0]}, '1',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:query',        '#', 103, 1, now(), null, null, '');
-
-insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
-values(${table.menuIds[2]}, '${functionName}新增', ${table.menuIds[0]}, '2',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:add',          '#', 103, 1, now(), null, null, '');
-
-insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
-values(${table.menuIds[3]}, '${functionName}修改', ${table.menuIds[0]}, '3',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:edit',         '#', 103, 1, now(), null, null, '');
-
-insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
-values(${table.menuIds[4]}, '${functionName}删除', ${table.menuIds[0]}, '4',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:remove',       '#', 103, 1, now(), null, null, '');
-
-insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
-values(${table.menuIds[5]}, '${functionName}导出', ${table.menuIds[0]}, '5',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:export',       '#', 103, 1, now(), null, null, '');
-
diff --git a/src/main/resources/vm/sql/sql.vm b/src/main/resources/vm/sql/sql.vm
deleted file mode 100644
index 01824c2..0000000
--- a/src/main/resources/vm/sql/sql.vm
+++ /dev/null
@@ -1,19 +0,0 @@
--- 菜单 SQL
-insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
-values(${table.menuIds[0]}, '${functionName}', '${parentMenuId}', '1', '${businessName}', '${moduleName}/${businessName}/index', 1, 0, 'C', '0', '0', '${permissionPrefix}:list', '#', 103, 1, sysdate(), null, null, '${functionName}菜单');
-
--- 按钮 SQL
-insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
-values(${table.menuIds[1]}, '${functionName}查询', ${table.menuIds[0]}, '1',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:query',        '#', 103, 1, sysdate(), null, null, '');
-
-insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
-values(${table.menuIds[2]}, '${functionName}新增', ${table.menuIds[0]}, '2',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:add',          '#', 103, 1, sysdate(), null, null, '');
-
-insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
-values(${table.menuIds[3]}, '${functionName}修改', ${table.menuIds[0]}, '3',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:edit',         '#', 103, 1, sysdate(), null, null, '');
-
-insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
-values(${table.menuIds[4]}, '${functionName}删除', ${table.menuIds[0]}, '4',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:remove',       '#', 103, 1, sysdate(), null, null, '');
-
-insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
-values(${table.menuIds[5]}, '${functionName}导出', ${table.menuIds[0]}, '5',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:export',       '#', 103, 1, sysdate(), null, null, '');
diff --git a/src/main/resources/vm/sql/sqlserver/sql.vm b/src/main/resources/vm/sql/sqlserver/sql.vm
deleted file mode 100644
index bdf166e..0000000
--- a/src/main/resources/vm/sql/sqlserver/sql.vm
+++ /dev/null
@@ -1,19 +0,0 @@
--- 菜单 SQL
-insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
-values(${table.menuIds[0]}, '${functionName}', '${parentMenuId}', '1', '${businessName}', '${moduleName}/${businessName}/index', 1, 0, 'C', '0', '0', '${permissionPrefix}:list', '#', 103, 1, getdate(), null, null, '${functionName}菜单');
-
--- 按钮 SQL
-insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
-values(${table.menuIds[1]}, '${functionName}查询', ${table.menuIds[0]}, '1',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:query',        '#', 103, 1, getdate(), null, null, '');
-
-insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
-values(${table.menuIds[2]}, '${functionName}新增', ${table.menuIds[0]}, '2',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:add',          '#', 103, 1, getdate(), null, null, '');
-
-insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
-values(${table.menuIds[3]}, '${functionName}修改', ${table.menuIds[0]}, '3',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:edit',         '#', 103, 1, getdate(), null, null, '');
-
-insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
-values(${table.menuIds[4]}, '${functionName}删除', ${table.menuIds[0]}, '4',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:remove',       '#', 103, 1, getdate(), null, null, '');
-
-insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
-values(${table.menuIds[5]}, '${functionName}导出', ${table.menuIds[0]}, '5',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:export',       '#', 103, 1, getdate(), null, null, '');
diff --git a/src/main/resources/vm/ts/api.ts.vm b/src/main/resources/vm/ts/api.ts.vm
deleted file mode 100644
index 3aa4a5f..0000000
--- a/src/main/resources/vm/ts/api.ts.vm
+++ /dev/null
@@ -1,63 +0,0 @@
-import request from '@/utils/request';
-import { AxiosPromise } from 'axios';
-import { ${BusinessName}VO, ${BusinessName}Form, ${BusinessName}Query } from '@/api/${moduleName}/${businessName}/types';
-
-/**
- * 查询${functionName}列表
- * @param query
- * @returns {*}
- */
-
-export const list${BusinessName} = (query?: ${BusinessName}Query): AxiosPromise<${BusinessName}VO[]> => {
-  return request({
-    url: '/${moduleName}/${businessName}/list',
-    method: 'get',
-    params: query
-  });
-};
-
-/**
- * 查询${functionName}详细
- * @param ${pkColumn.javaField}
- */
-export const get${BusinessName} = (${pkColumn.javaField}: string | number): AxiosPromise<${BusinessName}VO> => {
-  return request({
-    url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField},
-    method: 'get'
-  });
-};
-
-/**
- * 新增${functionName}
- * @param data
- */
-export const add${BusinessName} = (data: ${BusinessName}Form) => {
-  return request({
-    url: '/${moduleName}/${businessName}',
-    method: 'post',
-    data: data
-  });
-};
-
-/**
- * 修改${functionName}
- * @param data
- */
-export const update${BusinessName} = (data: ${BusinessName}Form) => {
-  return request({
-    url: '/${moduleName}/${businessName}',
-    method: 'put',
-    data: data
-  });
-};
-
-/**
- * 删除${functionName}
- * @param ${pkColumn.javaField}
- */
-export const del${BusinessName} = (${pkColumn.javaField}: string | number | Array<string | number>) => {
-  return request({
-    url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField},
-    method: 'delete'
-  });
-};
diff --git a/src/main/resources/vm/ts/types.ts.vm b/src/main/resources/vm/ts/types.ts.vm
deleted file mode 100644
index c3f6ed1..0000000
--- a/src/main/resources/vm/ts/types.ts.vm
+++ /dev/null
@@ -1,58 +0,0 @@
-export interface ${BusinessName}VO {
-#foreach ($column in $columns)
-#if($column.list)
-  /**
-   * $column.columnComment
-   */
-  $column.javaField:#if($column.javaField.indexOf("id") != -1 || $column.javaField.indexOf("Id") != -1) string | number;
-                        #elseif($column.javaType == 'Long' || $column.javaType == 'Integer' || $column.javaType == 'Double' || $column.javaType == 'Float' || $column.javaType == 'BigDecimal') number;
-                        #elseif($column.javaType == 'Boolean') boolean;
-                        #else string;
-                    #end
-#end
-#end
-#if ($table.tree)
-    /**
-     * 子对象
-     */
-    children: ${BusinessName}VO[];
-#end
-}
-
-export interface ${BusinessName}Form extends BaseEntity {
-#foreach ($column in $columns)
-#if($column.insert || $column.edit)
-  /**
-   * $column.columnComment
-   */
-  $column.javaField?:#if($column.javaField.indexOf("id") != -1 || $column.javaField.indexOf("Id") != -1) string | number;
-                        #elseif($column.javaType == 'Long' || $column.javaType == 'Integer' || $column.javaType == 'Double' || $column.javaType == 'Float' || $column.javaType == 'BigDecimal') number;
-                        #elseif($column.javaType == 'Boolean') boolean;
-                        #else string;
-                    #end
-#end
-#end
-}
-
-export interface ${BusinessName}Query #if(!${treeCode})extends PageQuery #end{
-
-#foreach ($column in $columns)
-#if($column.query)
-  /**
-   * $column.columnComment
-   */
-  $column.javaField?:#if($column.javaField.indexOf("id") != -1 || $column.javaField.indexOf("Id") != -1) string | number;
-                        #elseif($column.javaType == 'Long' || $column.javaType == 'Integer' || $column.javaType == 'Double' || $column.javaType == 'Float' || $column.javaType == 'BigDecimal') number;
-                        #elseif($column.javaType == 'Boolean') boolean;
-                        #else string;
-                    #end
-#end
-#end
-    /**
-     * 日期范围参数
-     */
-    params?: any;
-}
-
-
-
diff --git a/src/main/resources/vm/vue/index-tree.vue.vm b/src/main/resources/vm/vue/index-tree.vue.vm
deleted file mode 100644
index af3275e..0000000
--- a/src/main/resources/vm/vue/index-tree.vue.vm
+++ /dev/null
@@ -1,501 +0,0 @@
-<template>
-  <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
-      <div class="search" v-show="showSearch">
-        <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
-#foreach($column in $columns)
-#if($column.query)
-#set($dictType=$column.dictType)
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($column.htmlType == "input" || $column.htmlType == "textarea")
-          <el-form-item label="${comment}" prop="${column.javaField}">
-            <el-input v-model="queryParams.${column.javaField}" placeholder="请输入${comment}" clearable style="width: 240px" @keyup.enter="handleQuery" />
-          </el-form-item>
-#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
-          <el-form-item label="${comment}" prop="${column.javaField}">
-            <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>
-              <el-option
-                  v-for="dict in ${dictType}"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-              />
-            </el-select>
-          </el-form-item>
-#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
-          <el-form-item label="${comment}" prop="${column.javaField}">
-            <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>
-              <el-option label="请选择字典生成" value="" />
-            </el-select>
-          </el-form-item>
-#elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
-          <el-form-item label="${comment}" prop="${column.javaField}">
-            <el-date-picker clearable
-                v-model="queryParams.${column.javaField}"
-                type="date"
-                value-format="YYYY-MM-DD"
-                placeholder="选择${comment}"
-            />
-          </el-form-item>
-#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-          <el-form-item label="${comment}" style="width: 308px">
-            <el-date-picker
-                v-model="dateRange${AttrName}"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                type="daterange"
-                range-separator="-"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-                :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
-            />
-          </el-form-item>
-#end
-#end
-#end
-          <el-form-item>
-            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-          </el-form-item>
-        </el-form>
-      </div>
-    </transition>
-
-    <el-card shadow="never">
-      <template #header>
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd()" v-hasPermi="['${moduleName}:${businessName}:add']">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="info" plain icon="Sort" @click="handleToggleExpandAll">展开/折叠</el-button>
-          </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
-      </template>
-      <el-table
-        v-loading="loading"
-        :data="${businessName}List"
-        row-key="${treeCode}"
-        :default-expand-all="isExpandAll"
-        :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
-        ref="${businessName}TableRef"
-      >
-#foreach($column in $columns)
-#set($javaField=$column.javaField)
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($column.pk)
-#elseif($column.list && $column.htmlType == "datetime")
-        <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
-          <template #default="scope">
-            <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column>
-#elseif($column.list && $column.htmlType == "imageUpload")
-        <el-table-column label="${comment}" align="center" prop="${javaField}" width="100">
-          <template #default="scope">
-            <image-preview :src="scope.row.${javaField}" :width="50" :height="50"/>
-          </template>
-        </el-table-column>
-#elseif($column.list && $column.dictType && "" != $column.dictType)
-        <el-table-column label="${comment}" align="center" prop="${javaField}">
-          <template #default="scope">
-#if($column.htmlType == "checkbox")
-            <dict-tag :options="${column.dictType}" :value="scope.row.${javaField} ? scope.row.${javaField}.split(',') : []"/>
-#else
-            <dict-tag :options="${column.dictType}" :value="scope.row.${javaField}"/>
-#end
-          </template>
-        </el-table-column>
-#elseif($column.list && "" != $javaField)
-#if(${foreach.index} == 1)
-        <el-table-column label="${comment}" prop="${javaField}" />
-#else
-        <el-table-column label="${comment}" align="center" prop="${javaField}" />
-#end
-#end
-#end
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-          <template #default="scope">
-            <el-tooltip content="修改" placement="top">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['${moduleName}:${businessName}:edit']" />
-            </el-tooltip>
-            <el-tooltip content="新增" placement="top">
-              <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['${moduleName}:${businessName}:add']" />
-            </el-tooltip>
-            <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['${moduleName}:${businessName}:remove']" />
-            </el-tooltip>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-card>
-    <!-- 添加或修改${functionName}对话框 -->
-    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <el-form ref="${businessName}FormRef" :model="form" :rules="rules" label-width="80px">
-#foreach($column in $columns)
-#set($field=$column.javaField)
-#if(($column.insert || $column.edit) && !$column.pk)
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#set($dictType=$column.dictType)
-#if("" != $treeParentCode && $column.javaField == $treeParentCode)
-        <el-form-item label="${comment}" prop="${treeParentCode}">
-          <el-tree-select
-            v-model="form.${treeParentCode}"
-            :data="${businessName}Options"
-            :props="{ value: '${treeCode}', label: '${treeName}', children: 'children' }"
-            value-key="${treeCode}"
-            placeholder="请选择${comment}"
-            check-strictly
-          />
-        </el-form-item>
-#elseif($column.htmlType == "input")
-        <el-form-item label="${comment}" prop="${field}">
-          <el-input v-model="form.${field}" placeholder="请输入${comment}" />
-        </el-form-item>
-#elseif($column.htmlType == "imageUpload")
-        <el-form-item label="${comment}" prop="${field}">
-          <image-upload v-model="form.${field}"/>
-        </el-form-item>
-#elseif($column.htmlType == "fileUpload")
-        <el-form-item label="${comment}" prop="${field}">
-          <file-upload v-model="form.${field}"/>
-        </el-form-item>
-#elseif($column.htmlType == "editor")
-        <el-form-item label="${comment}">
-          <editor v-model="form.${field}" :min-height="192"/>
-        </el-form-item>
-#elseif($column.htmlType == "select" && "" != $dictType)
-        <el-form-item label="${comment}" prop="${field}">
-          <el-select v-model="form.${field}" placeholder="请选择${comment}">
-            <el-option
-              v-for="dict in ${dictType}"
-              :key="dict.value"
-              :label="dict.label"
-#if($column.javaType == "Integer" || $column.javaType == "Long")
-              :value="parseInt(dict.value)"
-#else
-              :value="dict.value"
-#end
-            ></el-option>
-          </el-select>
-        </el-form-item>
-#elseif($column.htmlType == "select" && $dictType)
-        <el-form-item label="${comment}" prop="${field}">
-          <el-select v-model="form.${field}" placeholder="请选择${comment}">
-            <el-option label="请选择字典生成" value="" />
-          </el-select>
-        </el-form-item>
-#elseif($column.htmlType == "checkbox" && "" != $dictType)
-        <el-form-item label="${comment}" prop="${field}">
-          <el-checkbox-group v-model="form.${field}">
-            <el-checkbox
-              v-for="dict in ${dictType}"
-              :key="dict.value"
-              :label="dict.value">
-              {{dict.label}}
-            </el-checkbox>
-          </el-checkbox-group>
-        </el-form-item>
-#elseif($column.htmlType == "checkbox" && $dictType)
-        <el-form-item label="${comment}" prop="${field}">
-          <el-checkbox-group v-model="form.${field}">
-            <el-checkbox>请选择字典生成</el-checkbox>
-          </el-checkbox-group>
-        </el-form-item>
-#elseif($column.htmlType == "radio" && "" != $dictType)
-        <el-form-item label="${comment}" prop="${field}">
-          <el-radio-group v-model="form.${field}">
-            <el-radio
-              v-for="dict in ${dictType}"
-              :key="dict.value"
-#if($column.javaType == "Integer" || $column.javaType == "Long")
-              :label="parseInt(dict.value)"
-#else
-              :label="dict.value"
-#end
-            >{{dict.label}}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-#elseif($column.htmlType == "radio" && $dictType)
-        <el-form-item label="${comment}" prop="${field}">
-          <el-radio-group v-model="form.${field}">
-            <el-radio label="1">请选择字典生成</el-radio>
-          </el-radio-group>
-        </el-form-item>
-#elseif($column.htmlType == "datetime")
-        <el-form-item label="${comment}" prop="${field}">
-          <el-date-picker clearable
-            v-model="form.${field}"
-            type="datetime"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="选择${comment}"
-          />
-        </el-form-item>
-#elseif($column.htmlType == "textarea")
-        <el-form-item label="${comment}" prop="${field}">
-          <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-#end
-#end
-#end
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
-  </div>
-</template>
-
-<script setup name="${BusinessName}" lang="ts">
-import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}";
-import { ${BusinessName}VO, ${BusinessName}Query, ${BusinessName}Form } from '@/api/${moduleName}/${businessName}/types';
-
-type ${BusinessName}Option = {
-  ${treeCode}: number;
-  ${treeName}: string;
-  children?: ${BusinessName}Option[];
-}
-
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;;
-
-#if(${dicts} != '')
-#set($dictsNoSymbol=$dicts.replace("'", ""))
-const { ${dictsNoSymbol} } = toRefs<any>(proxy?.useDict(${dicts}));
-#end
-
-const ${businessName}List = ref<${BusinessName}VO[]>([]);
-const ${businessName}Options = ref<${BusinessName}Option[]>([]);
-const buttonLoading = ref(false);
-const showSearch = ref(true);
-const isExpandAll = ref(true);
-const loading = ref(false);
-
-const queryFormRef = ref<ElFormInstance>();
-const ${businessName}FormRef = ref<ElFormInstance>();
-const ${businessName}TableRef = ref<ElTableInstance>()
-
-const dialog = reactive<DialogOption>({
-    visible: false,
-    title: ''
-});
-
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-const dateRange${AttrName} = ref<[DateModelType, DateModelType]>(['', '']);
-#end
-#end
-
-const initFormData: ${BusinessName}Form = {
-#foreach ($column in $columns)
-#if($column.insert || $column.edit)
-#if($column.htmlType == "checkbox")
-    $column.javaField: []#if($foreach.count != $columns.size()),#end
-#else
-    $column.javaField: undefined#if($foreach.count != $columns.size()),#end
-#end
-#end
-#end
-}
-
-const data = reactive<PageData<${BusinessName}Form, ${BusinessName}Query>>({
-  form: {...initFormData},
-  queryParams: {
-#foreach ($column in $columns)
-#if($column.query)
-#if($column.htmlType != "datetime" || $column.queryType != "BETWEEN")
-    $column.javaField: undefined,
-#end
-#end
-#end
-    params: {
-#foreach ($column in $columns)
-#if($column.query)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-      $column.javaField: undefined#if($foreach.count != $columns.size()),#end
-#end
-#end
-#end
-    }
-  },
-  rules: {
-#foreach ($column in $columns)
-#if($column.insert || $column.edit)
-#if($column.required)
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-    $column.javaField: [
-      { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select" || $column.htmlType == "radio")"change"#else"blur"#end }
-    ]#if($foreach.count != $columns.size()),#end
-#end
-#end
-#end
-  }
-});
-
-const { queryParams, form, rules } = toRefs(data);
-
-/** 查询${functionName}列表 */
-const getList = async () => {
-  loading.value = true;
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-  queryParams.value.params = {};
-#break
-#end
-#end
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-  proxy?.addDateRange(queryParams.value, dateRange${AttrName}.value, '${AttrName}');
-#end
-#end
-  const res = await list${BusinessName}(queryParams.value);
-  const data = proxy?.handleTree<${BusinessName}VO>(res.data, "${treeCode}", "${treeParentCode}");
-  if (data) {
-    ${businessName}List.value = data;
-    loading.value = false;
-  }
-}
-
-/** 查询${functionName}下拉树结构 */
-const getTreeselect = async () => {
-  const res = await list${BusinessName}();
-  ${businessName}Options.value = [];
-  const data: ${BusinessName}Option = { ${treeCode}: 0, ${treeName}: '顶级节点', children: [] };
-  data.children = proxy?.handleTree<${BusinessName}Option>(res.data, "${treeCode}", "${treeParentCode}");
-  ${businessName}Options.value.push(data);
-}
-
-// 取消按钮
-const cancel = () => {
-  reset();
-  dialog.visible = false;
-}
-
-// 表单重置
-const reset = () => {
-  form.value = {...initFormData}
-  ${businessName}FormRef.value?.resetFields();
-}
-
-/** 搜索按钮操作 */
-const handleQuery = () => {
-  getList();
-}
-
-/** 重置按钮操作 */
-const resetQuery = () => {
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-  dateRange${AttrName}.value = ['', ''];
-#end
-#end
-  queryFormRef.value?.resetFields();
-  handleQuery();
-}
-
-/** 新增按钮操作 */
-const handleAdd = (row?: ${BusinessName}VO) => {
-  reset();
-  getTreeselect();
-  if (row != null && row.${treeCode}) {
-      form.value.${treeParentCode} = row.${treeCode};
-  } else {
-      form.value.${treeParentCode} = 0;
-  }
-  dialog.visible = true;
-  dialog.title = "添加${functionName}";
-}
-
-/** 展开/折叠操作 */
-const handleToggleExpandAll = () => {
-  isExpandAll.value = !isExpandAll.value;
-  toggleExpandAll(${businessName}List.value, isExpandAll.value)
-}
-
-/** 展开/折叠操作 */
-const toggleExpandAll = (data: ${BusinessName}VO[], status: boolean) => {
-  data.forEach((item) => {
-    ${businessName}TableRef.value?.toggleRowExpansion(item, status)
-    if (item.children && item.children.length > 0) toggleExpandAll(item.children, status)
-  })
-}
-
-/** 修改按钮操作 */
-const handleUpdate = async (row: ${BusinessName}VO) => {
-  reset();
-  await getTreeselect();
-  if (row != null) {
-    form.value.${treeParentCode} = row.${treeParentCode};
-  }
-  const res = await get${BusinessName}(row.${pkColumn.javaField});
-  Object.assign(form.value, res.data);
-#foreach ($column in $columns)
-  #if($column.htmlType == "checkbox")
-  form.value.$column.javaField = form.value.${column.javaField}.split(",");
-  #end
-#end
-  dialog.visible = true;
-  dialog.title = "修改${functionName}";
-}
-
-/** 提交按钮 */
-const submitForm = () => {
-  ${businessName}FormRef.value?.validate(async (valid: boolean) => {
-    if (valid) {
-      buttonLoading.value = true;
-#foreach ($column in $columns)
-#if($column.htmlType == "checkbox")
-      form.value.$column.javaField = form.value.${column.javaField}.join(",");
-#end
-#end
-      if (form.value.${pkColumn.javaField}) {
-        await update${BusinessName}(form.value).finally(() => buttonLoading.value = false);
-      } else {
-        await add${BusinessName}(form.value).finally(() => buttonLoading.value = false);
-      }
-      proxy?.#[[$modal]]#.msgSuccess("操作成功");
-      dialog.visible = false;
-      getList();
-    }
-  });
-}
-
-/** 删除按钮操作 */
-const handleDelete = async (row: ${BusinessName}VO) => {
-  await proxy?.#[[$modal]]#.confirm('是否确认删除${functionName}编号为"' + row.${pkColumn.javaField} + '"的数据项？');
-  loading.value = true;
-  await del${BusinessName}(row.${pkColumn.javaField}).finally(() => loading.value = false);
-  await getList();
-  proxy?.#[[$modal]]#.msgSuccess("删除成功");
-}
-
-onMounted(() => {
-  getList();
-});
-</script>
diff --git a/src/main/resources/vm/vue/index.vue.vm b/src/main/resources/vm/vue/index.vue.vm
deleted file mode 100644
index 8b132f4..0000000
--- a/src/main/resources/vm/vue/index.vue.vm
+++ /dev/null
@@ -1,468 +0,0 @@
-<template>
-  <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
-      <div class="search" v-show="showSearch">
-        <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
-#foreach($column in $columns)
-#if($column.query)
-#set($dictType=$column.dictType)
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($column.htmlType == "input" || $column.htmlType == "textarea")
-          <el-form-item label="${comment}" prop="${column.javaField}">
-            <el-input v-model="queryParams.${column.javaField}" placeholder="请输入${comment}" clearable style="width: 240px" @keyup.enter="handleQuery" />
-          </el-form-item>
-#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
-          <el-form-item label="${comment}" prop="${column.javaField}">
-            <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>
-              <el-option
-                v-for="dict in ${dictType}"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
-            </el-select>
-          </el-form-item>
-#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
-          <el-form-item label="${comment}" prop="${column.javaField}">
-            <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>
-              <el-option label="请选择字典生成" value="" />
-            </el-select>
-          </el-form-item>
-#elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
-          <el-form-item label="${comment}" prop="${column.javaField}">
-            <el-date-picker clearable
-              v-model="queryParams.${column.javaField}"
-              type="date"
-              value-format="YYYY-MM-DD"
-              placeholder="请选择${comment}"
-            />
-          </el-form-item>
-#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-          <el-form-item label="${comment}" style="width: 308px">
-            <el-date-picker
-                v-model="dateRange${AttrName}"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                type="daterange"
-                range-separator="-"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-                :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
-            />
-          </el-form-item>
-#end
-#end
-#end
-          <el-form-item>
-            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-          </el-form-item>
-        </el-form>
-      </div>
-    </transition>
-
-    <el-card shadow="never">
-      <template #header>
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['${moduleName}:${businessName}:add']">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['${moduleName}:${businessName}:edit']">修改</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['${moduleName}:${businessName}:remove']">删除</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['${moduleName}:${businessName}:export']">导出</el-button>
-          </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
-      </template>
-
-      <el-table v-loading="loading" :data="${businessName}List" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center" />
-#foreach($column in $columns)
-#set($javaField=$column.javaField)
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($column.pk)
-        <el-table-column label="${comment}" align="center" prop="${javaField}" v-if="${column.list}" />
-#elseif($column.list && $column.htmlType == "datetime")
-        <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
-          <template #default="scope">
-            <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column>
-#elseif($column.list && $column.htmlType == "imageUpload")
-        <el-table-column label="${comment}" align="center" prop="${javaField}" width="100">
-          <template #default="scope">
-            <image-preview :src="scope.row.${javaField}" :width="50" :height="50"/>
-          </template>
-        </el-table-column>
-#elseif($column.list && $column.dictType && "" != $column.dictType)
-        <el-table-column label="${comment}" align="center" prop="${javaField}">
-          <template #default="scope">
-#if($column.htmlType == "checkbox")
-            <dict-tag :options="${column.dictType}" :value="scope.row.${javaField} ? scope.row.${javaField}.split(',') : []"/>
-#else
-            <dict-tag :options="${column.dictType}" :value="scope.row.${javaField}"/>
-#end
-          </template>
-        </el-table-column>
-#elseif($column.list && "" != $javaField)
-        <el-table-column label="${comment}" align="center" prop="${javaField}" />
-#end
-#end
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-          <template #default="scope">
-            <el-tooltip content="修改" placement="top">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['${moduleName}:${businessName}:edit']"></el-button>
-            </el-tooltip>
-            <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['${moduleName}:${businessName}:remove']"></el-button>
-            </el-tooltip>
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <pagination
-          v-show="total>0"
-          :total="total"
-          v-model:page="queryParams.pageNum"
-          v-model:limit="queryParams.pageSize"
-          @pagination="getList"
-      />
-    </el-card>
-    <!-- 添加或修改${functionName}对话框 -->
-    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <el-form ref="${businessName}FormRef" :model="form" :rules="rules" label-width="80px">
-#foreach($column in $columns)
-#set($field=$column.javaField)
-#if(($column.insert || $column.edit) && !$column.pk)
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#set($dictType=$column.dictType)
-#if($column.htmlType == "input")
-        <el-form-item label="${comment}" prop="${field}">
-          <el-input v-model="form.${field}" placeholder="请输入${comment}" />
-        </el-form-item>
-#elseif($column.htmlType == "imageUpload")
-        <el-form-item label="${comment}" prop="${field}">
-          <image-upload v-model="form.${field}"/>
-        </el-form-item>
-#elseif($column.htmlType == "fileUpload")
-        <el-form-item label="${comment}" prop="${field}">
-          <file-upload v-model="form.${field}"/>
-        </el-form-item>
-#elseif($column.htmlType == "editor")
-        <el-form-item label="${comment}">
-          <editor v-model="form.${field}" :min-height="192"/>
-        </el-form-item>
-#elseif($column.htmlType == "select" && "" != $dictType)
-        <el-form-item label="${comment}" prop="${field}">
-          <el-select v-model="form.${field}" placeholder="请选择${comment}">
-            <el-option
-                v-for="dict in ${dictType}"
-                :key="dict.value"
-                :label="dict.label"
-#if($column.javaType == "Integer" || $column.javaType == "Long")
-                :value="parseInt(dict.value)"
-#else
-                :value="dict.value"
-#end
-            ></el-option>
-          </el-select>
-        </el-form-item>
-#elseif($column.htmlType == "select" && $dictType)
-        <el-form-item label="${comment}" prop="${field}">
-          <el-select v-model="form.${field}" placeholder="请选择${comment}">
-            <el-option label="请选择字典生成" value="" />
-          </el-select>
-        </el-form-item>
-#elseif($column.htmlType == "checkbox" && "" != $dictType)
-        <el-form-item label="${comment}" prop="${field}">
-          <el-checkbox-group v-model="form.${field}">
-            <el-checkbox
-                v-for="dict in ${dictType}"
-                :key="dict.value"
-                :label="dict.value">
-                {{dict.label}}
-            </el-checkbox>
-          </el-checkbox-group>
-        </el-form-item>
-#elseif($column.htmlType == "checkbox" && $dictType)
-        <el-form-item label="${comment}" prop="${field}">
-          <el-checkbox-group v-model="form.${field}">
-            <el-checkbox>请选择字典生成</el-checkbox>
-          </el-checkbox-group>
-        </el-form-item>
-#elseif($column.htmlType == "radio" && "" != $dictType)
-        <el-form-item label="${comment}" prop="${field}">
-          <el-radio-group v-model="form.${field}">
-            <el-radio
-                v-for="dict in ${dictType}"
-                :key="dict.value"
-#if($column.javaType == "Integer" || $column.javaType == "Long")
-                :label="parseInt(dict.value)"
-#else
-                :label="dict.value"
-#end
-            >{{dict.label}}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-#elseif($column.htmlType == "radio" && $dictType)
-        <el-form-item label="${comment}" prop="${field}">
-          <el-radio-group v-model="form.${field}">
-                <el-radio label="1">请选择字典生成</el-radio>
-          </el-radio-group>
-        </el-form-item>
-#elseif($column.htmlType == "datetime")
-        <el-form-item label="${comment}" prop="${field}">
-          <el-date-picker clearable
-            v-model="form.${field}"
-            type="datetime"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="请选择${comment}">
-          </el-date-picker>
-        </el-form-item>
-#elseif($column.htmlType == "textarea")
-        <el-form-item label="${comment}" prop="${field}">
-            <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-#end
-#end
-#end
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
-  </div>
-</template>
-
-<script setup name="${BusinessName}" lang="ts">
-import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from '@/api/${moduleName}/${businessName}';
-import { ${BusinessName}VO, ${BusinessName}Query, ${BusinessName}Form } from '@/api/${moduleName}/${businessName}/types';
-
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-#if(${dicts} != '')
-#set($dictsNoSymbol=$dicts.replace("'", ""))
-const { ${dictsNoSymbol} } = toRefs<any>(proxy?.useDict(${dicts}));
-#end
-
-const ${businessName}List = ref<${BusinessName}VO[]>([]);
-const buttonLoading = ref(false);
-const loading = ref(true);
-const showSearch = ref(true);
-const ids = ref<Array<string | number>>([]);
-const single = ref(true);
-const multiple = ref(true);
-const total = ref(0);
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-const dateRange${AttrName} = ref<[DateModelType, DateModelType]>(['', '']);
-#end
-#end
-
-const queryFormRef = ref<ElFormInstance>();
-const ${businessName}FormRef = ref<ElFormInstance>();
-
-const dialog = reactive<DialogOption>({
-  visible: false,
-  title: ''
-});
-
-const initFormData: ${BusinessName}Form = {
-#foreach ($column in $columns)
-#if($column.insert || $column.edit)
-#if($column.htmlType == "checkbox")
-  $column.javaField: []#if($foreach.count != $columns.size()),#end
-#else
-  $column.javaField: undefined#if($foreach.count != $columns.size()),#end
-#end
-#end
-#end
-}
-const data = reactive<PageData<${BusinessName}Form, ${BusinessName}Query>>({
-  form: {...initFormData},
-  queryParams: {
-    pageNum: 1,
-    pageSize: 10,
-#foreach ($column in $columns)
-#if($column.query)
-#if($column.htmlType != "datetime" || $column.queryType != "BETWEEN")
-    $column.javaField: undefined,
-#end
-#end
-#end
-    params: {
-#foreach ($column in $columns)
-#if($column.query)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-      $column.javaField: undefined#if($foreach.count != $columns.size()),#end
-#end
-#end
-#end
-    }
-  },
-  rules: {
-#foreach ($column in $columns)
-#if($column.insert || $column.edit)
-#if($column.required)
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-    $column.javaField: [
-      { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select" || $column.htmlType == "radio")"change"#else"blur"#end }
-    ]#if($foreach.count != $columns.size()),#end
-#end
-#end
-#end
-  }
-});
-
-const { queryParams, form, rules } = toRefs(data);
-
-/** 查询${functionName}列表 */
-const getList = async () => {
-  loading.value = true;
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-  queryParams.value.params = {};
-#break
-#end
-#end
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-  proxy?.addDateRange(queryParams.value, dateRange${AttrName}.value, '${AttrName}');
-#end
-#end
-  const res = await list${BusinessName}(queryParams.value);
-  ${businessName}List.value = res.rows;
-  total.value = res.total;
-  loading.value = false;
-}
-
-/** 取消按钮 */
-const cancel = () => {
-  reset();
-  dialog.visible = false;
-}
-
-/** 表单重置 */
-const reset = () => {
-  form.value = {...initFormData};
-  ${businessName}FormRef.value?.resetFields();
-}
-
-/** 搜索按钮操作 */
-const handleQuery = () => {
-  queryParams.value.pageNum = 1;
-  getList();
-}
-
-/** 重置按钮操作 */
-const resetQuery = () => {
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-  dateRange${AttrName}.value = ['', ''];
-#end
-#end
-  queryFormRef.value?.resetFields();
-  handleQuery();
-}
-
-/** 多选框选中数据 */
-const handleSelectionChange = (selection: ${BusinessName}VO[]) => {
-  ids.value = selection.map(item => item.${pkColumn.javaField});
-  single.value = selection.length != 1;
-  multiple.value = !selection.length;
-}
-
-/** 新增按钮操作 */
-const handleAdd = () => {
-  reset();
-  dialog.visible = true;
-  dialog.title = "添加${functionName}";
-}
-
-/** 修改按钮操作 */
-const handleUpdate = async (row?: ${BusinessName}VO) => {
-  reset();
-  const _${pkColumn.javaField} = row?.${pkColumn.javaField} || ids.value[0]
-  const res = await get${BusinessName}(_${pkColumn.javaField});
-  Object.assign(form.value, res.data);
-#foreach ($column in $columns)
-  #if($column.htmlType == "checkbox")
-  form.value.$column.javaField = form.value.${column.javaField}.split(",");
-  #end
-#end
-  dialog.visible = true;
-  dialog.title = "修改${functionName}";
-}
-
-/** 提交按钮 */
-const submitForm = () => {
-  ${businessName}FormRef.value?.validate(async (valid: boolean) => {
-    if (valid) {
-      buttonLoading.value = true;
-      #foreach ($column in $columns)
-        #if($column.htmlType == "checkbox")
-        form.value.$column.javaField = form.value.${column.javaField}.join(",");
-        #end
-      #end
-      if (form.value.${pkColumn.javaField}) {
-        await update${BusinessName}(form.value).finally(() =>  buttonLoading.value = false);
-      } else {
-        await add${BusinessName}(form.value).finally(() =>  buttonLoading.value = false);
-      }
-      proxy?.#[[$modal]]#.msgSuccess("修改成功");
-      dialog.visible = false;
-      await getList();
-    }
-  });
-}
-
-/** 删除按钮操作 */
-const handleDelete = async (row?: ${BusinessName}VO) => {
-  const _${pkColumn.javaField}s = row?.${pkColumn.javaField} || ids.value;
-  await proxy?.#[[$modal]]#.confirm('是否确认删除${functionName}编号为"' + _${pkColumn.javaField}s + '"的数据项？').finally(() => loading.value = false);
-  await del${BusinessName}(_${pkColumn.javaField}s);
-  proxy?.#[[$modal]]#.msgSuccess("删除成功");
-  await getList();
-}
-
-/** 导出按钮操作 */
-const handleExport = () => {
-  proxy?.download('${moduleName}/${businessName}/export', {
-    ...queryParams.value
-  }, `${businessName}_#[[${new Date().getTime()}]]#.xlsx`)
-}
-
-onMounted(() => {
-  getList();
-});
-</script>
diff --git a/src/main/resources/vm/xml/mapper.xml.vm b/src/main/resources/vm/xml/mapper.xml.vm
deleted file mode 100644
index 9fb48d9..0000000
--- a/src/main/resources/vm/xml/mapper.xml.vm
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="${packageName}.mapper.${ClassName}Mapper">
-
-</mapper>