diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/fieldx/vue/FieldxList.vue b/ant-design-vue-jeecg/src/views/skillPoints/SkillPointsList.vue
similarity index 50%
rename from jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/fieldx/vue/FieldxList.vue
rename to ant-design-vue-jeecg/src/views/skillPoints/SkillPointsList.vue
index 415ccfa..c755ae2 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/fieldx/vue/FieldxList.vue
+++ b/ant-design-vue-jeecg/src/views/skillPoints/SkillPointsList.vue
@@ -4,6 +4,17 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="技能点名称">
+              <a-input placeholder="请输入技能点名称" v-model="queryParam.skillName"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+            </span>
+          </a-col>
         </a-row>
       </a-form>
     </div>
@@ -12,12 +23,12 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('字段管理')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
+<!--      <a-button type="primary" icon="download" @click="handleExportXls('技能点管理')">导出</a-button>-->
+<!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+<!--        <a-button type="primary" icon="import">导入</a-button>-->
+<!--      </a-upload>-->
       <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+<!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
           <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
@@ -69,27 +80,20 @@
 
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
+          <a-divider type="vertical" />
 
+          <a @click="handleDetail(record)">详情</a>
           <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a @click="handleDetail(record)">详情</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                   <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
+          </a-popconfirm>
         </span>
 
       </a-table>
     </div>
 
-    <fieldx-modal ref="modalForm" @ok="modalFormOk"></fieldx-modal>
+    <skill-points-modal ref="modalForm" @ok="modalFormOk"></skill-points-modal>
   </a-card>
 </template>
 
@@ -98,18 +102,17 @@
   import '@/assets/less/TableExpand.less'
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import FieldxModal from './modules/FieldxModal'
-  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+  import SkillPointsModal from './modules/SkillPointsModal'
 
   export default {
-    name: 'FieldxList',
+    name: 'SkillPointsList',
     mixins:[JeecgListMixin, mixinDevice],
     components: {
-      FieldxModal
+      SkillPointsModal
     },
     data () {
       return {
-        description: '字段管理管理页面',
+        description: '技能点管理管理页面',
         // 表头
         columns: [
           {
@@ -123,90 +126,67 @@
             }
           },
           {
-            title:'对应实体id',
-            align:"center",
-            dataIndex: 'tableId'
-          },
-          {
-            title:'中文名称',
+            title:'编码',
             align:"center",
-            dataIndex: 'fieldName'
+            dataIndex: 'skillCode'
           },
           {
-            title:'英文名称',
+            title:'类型',
             align:"center",
-            dataIndex: 'fieldEnName'
+            dataIndex: 'skillType_dictText'
           },
           {
-            title:'数据类型',
+            title:'技能点名称',
             align:"center",
-            dataIndex: 'type_dictText'
+            dataIndex: 'skillName'
           },
           {
-            title:'数据长度',
+            title:'等级',
             align:"center",
-            dataIndex: 'length'
+            dataIndex: 'skillLevel'
           },
           {
-            title:'浮点精度',
+            title:'描述',
             align:"center",
-            dataIndex: 'accuracy'
-          },
-          {
-            title:'显示形式',
-            align:"center",
-            dataIndex: 'format'
-          },
-          {
-            title:'是否主键',
-            align:"center",
-            dataIndex: 'isPk'
-          },
-          {
-            title:'是否外键',
-            align:"center",
-            dataIndex: 'isFk'
-          },
-          {
-            title:'关联实体',
-            align:"center",
-            dataIndex: 'associateTable'
+            dataIndex: 'skillDesc',
+            scopedSlots: {customRender: 'htmlSlot'}
           },
           {
-            title:'关联字段',
+            title:'图标',
             align:"center",
-            dataIndex: 'associateField'
+            dataIndex: 'skillIcon',
+            scopedSlots: {customRender: 'imgSlot'}
           },
           {
-            title:'是否为空',
+            title:'图片',
             align:"center",
-            dataIndex: 'isNull'
+            dataIndex: 'skillPic',
+            scopedSlots: {customRender: 'imgSlot'}
           },
           {
-            title:'是否重复',
+            title:'技能点状态',
             align:"center",
-            dataIndex: 'isUniqueness'
+            dataIndex: 'skillStatus'
           },
           {
-            title:'字段规则',
+            title:'创建人',
             align:"center",
-            dataIndex: 'rule',
-            scopedSlots: {customRender: 'htmlSlot'}
+            dataIndex: 'createBy'
           },
           {
-            title:'字段状态',
+            title:'创建日期',
             align:"center",
-            dataIndex: 'status'
+            dataIndex: 'createTime'
           },
           {
-            title:'版本状态',
+            title:'修改人',
             align:"center",
-            dataIndex: 'verisonStatus'
+            dataIndex: 'updateBy'
           },
           {
-            title:'版本号',
+            title:'修改日期',
             align:"center",
-            dataIndex: 'verison'
+            dataIndex: 'updateTime'
           },
           {
             title: '操作',
@@ -218,11 +198,11 @@
           }
         ],
         url: {
-          list: "/fieldx/fieldx/list",
-          delete: "/fieldx/fieldx/delete",
-          deleteBatch: "/fieldx/fieldx/deleteBatch",
-          exportXlsUrl: "/fieldx/fieldx/exportXls",
-          importExcelUrl: "fieldx/fieldx/importExcel",
+          list: "/skillPoints/skillPoints/list",
+          delete: "/skillPoints/skillPoints/delete",
+          deleteBatch: "/skillPoints/skillPoints/deleteBatch",
+          exportXlsUrl: "/skillPoints/skillPoints/exportXls",
+          importExcelUrl: "skillPoints/skillPoints/importExcel",
           
         },
         dictOptions:{},
@@ -242,23 +222,18 @@
       },
       getSuperFieldList(){
         let fieldList=[];
-        fieldList.push({type:'string',value:'tableId',text:'对应实体id',dictCode:'tablex,table_name,id'})
-        fieldList.push({type:'string',value:'fieldName',text:'中文名称',dictCode:''})
-        fieldList.push({type:'string',value:'fieldEnName',text:'英文名称',dictCode:''})
-        fieldList.push({type:'sel_search',value:'type',text:'数据类型',dictTable:'', dictText:'', dictCode:'date_type'})
-        fieldList.push({type:'int',value:'length',text:'数据长度',dictCode:''})
-        fieldList.push({type:'int',value:'accuracy',text:'浮点精度',dictCode:''})
-        fieldList.push({type:'string',value:'format',text:'显示形式',dictCode:''})
-        fieldList.push({type:'int',value:'isPk',text:'是否主键',dictCode:''})
-        fieldList.push({type:'int',value:'isFk',text:'是否外键',dictCode:''})
-        fieldList.push({type:'string',value:'associateTable',text:'关联实体',dictCode:'tablex,table_name,id'})
-        fieldList.push({type:'string',value:'associateField',text:'关联字段',dictCode:'fieldx,field_name,id'})
-        fieldList.push({type:'int',value:'isNull',text:'是否为空',dictCode:''})
-        fieldList.push({type:'int',value:'isUniqueness',text:'是否重复',dictCode:''})
-        fieldList.push({type:'string',value:'rule',text:'字段规则',dictCode:''})
-        fieldList.push({type:'int',value:'status',text:'字段状态',dictCode:''})
-        fieldList.push({type:'int',value:'verisonStatus',text:'版本状态',dictCode:''})
-        fieldList.push({type:'int',value:'verison',text:'版本号',dictCode:''})
+        fieldList.push({type:'string',value:'skillCode',text:'编码',dictCode:''})
+        fieldList.push({type:'int',value:'skillType',text:'类型',dictCode:''})
+        fieldList.push({type:'string',value:'skillName',text:'技能点名称',dictCode:''})
+        fieldList.push({type:'int',value:'skillLevel',text:'等级',dictCode:''})
+        fieldList.push({type:'string',value:'skillDesc',text:'描述',dictCode:''})
+        fieldList.push({type:'string',value:'skillIcon',text:'图标',dictCode:''})
+        fieldList.push({type:'string',value:'skillPic',text:'图片',dictCode:''})
+        fieldList.push({type:'int',value:'skillStatus',text:'技能点状态',dictCode:''})
+        fieldList.push({type:'string',value:'createBy',text:'创建人',dictCode:''})
+        fieldList.push({type:'datetime',value:'createTime',text:'创建日期'})
+        fieldList.push({type:'string',value:'updateBy',text:'更新人',dictCode:''})
+        fieldList.push({type:'datetime',value:'updateTime',text:'更新日期'})
         this.superFieldList = fieldList
       }
     }
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/vue/modules/TablexForm.vue b/ant-design-vue-jeecg/src/views/skillPoints/modules/SkillPointsForm.vue
similarity index 50%
rename from jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/vue/modules/TablexForm.vue
rename to ant-design-vue-jeecg/src/views/skillPoints/modules/SkillPointsForm.vue
index 273b4e2..074bf6e 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/vue/modules/TablexForm.vue
+++ b/ant-design-vue-jeecg/src/views/skillPoints/modules/SkillPointsForm.vue
@@ -4,43 +4,38 @@
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
           <a-col :span="24">
-            <a-form-model-item label="对应模块id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="moduleId">
-              <j-search-select-tag v-model="model.moduleId" dict="modulex,module_name,id"  />
+            <a-form-model-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="supertypeId">
+              <j-search-select-tag v-model="model.supertypeId" dict="skill_type,type_name,id" placeholder="请选择类型"  ></j-search-select-tag>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="中文名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tableName">
-              <a-input v-model="model.tableName" placeholder="请输入中文名称"  ></a-input>
+            <a-form-model-item label="技能点名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="skillName">
+              <a-input v-model="model.skillName" placeholder="请输入技能点名称"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="英文名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tableEnName">
-              <a-input v-model="model.tableEnName" placeholder="请输入英文名称"  ></a-input>
+            <a-form-model-item label="等级" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="skillLevel">
+              <a-input-number v-model="model.skillLevel" placeholder="请输入等级" max="9" min="1" style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="表结构SQL" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tableStructure">
-              <a-input v-model="model.tableStructure" placeholder="请输入表结构SQL"  ></a-input>
+            <a-form-model-item label="描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="skillDesc">
+              <j-editor v-model="model.skillDesc"   ></j-editor>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="结构图" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="structuralDiagram">
-              <a-input v-model="model.structuralDiagram" placeholder="请输入结构图"  ></a-input>
+            <a-form-model-item label="图标" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="skillIcon">
+              <j-image-upload v-model="model.skillIcon"   ></j-image-upload>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="实体状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">
-              <a-input-number v-model="model.status" placeholder="请输入实体状态" style="width: 100%" />
+            <a-form-model-item label="图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="skillPic">
+              <j-image-upload v-model="model.skillPic"   ></j-image-upload>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="版本状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="verisonStatus">
-              <a-input-number v-model="model.verisonStatus" placeholder="请输入版本状态" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="版本号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="verison">
-              <a-input-number v-model="model.verison" placeholder="请输入版本号" style="width: 100%" />
+            <a-form-model-item label="技能点状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="skillStatus">
+              <j-dict-select-tag v-model="model.skillStatus" dictCode="skill_status"  placeholder="请选择技能点状态" style="width: 100%" />
             </a-form-model-item>
           </a-col>
         </a-row>
@@ -55,7 +50,7 @@
   import { validateDuplicateValue } from '@/utils/util'
 
   export default {
-    name: 'TablexForm',
+    name: 'SkillPointsForm',
     components: {
     },
     props: {
@@ -69,6 +64,8 @@
     data () {
       return {
         model:{
+          skillLevel:4,
+          skillStatus:1,
          },
         labelCol: {
           xs: { span: 24 },
@@ -80,29 +77,11 @@
         },
         confirmLoading: false,
         validatorRules: {
-           moduleId: [
-              { required: true, message: '请输入对应模块id!'},
-           ],
-           tableName: [
-              { required: true, message: '请输入中文名称!'},
-           ],
-           tableEnName: [
-              { required: true, message: '请输入英文名称!'},
-           ],
-           status: [
-              { required: true, message: '请输入实体状态!'},
-           ],
-           verisonStatus: [
-              { required: true, message: '请输入版本状态!'},
-           ],
-           verison: [
-              { required: true, message: '请输入版本号!'},
-           ],
         },
         url: {
-          add: "/tablex/tablex/add",
-          edit: "/tablex/tablex/edit",
-          queryById: "/tablex/tablex/queryById"
+          add: "/skillPoints/skillPoints/add",
+          edit: "/skillPoints/skillPoints/edit",
+          queryById: "/skillPoints/skillPoints/queryById"
         }
       }
     },
diff --git a/ant-design-vue-jeecg/src/views/skillPoints/modules/SkillPointsModal.vue b/ant-design-vue-jeecg/src/views/skillPoints/modules/SkillPointsModal.vue
new file mode 100644
index 0000000..2086fd3
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/skillPoints/modules/SkillPointsModal.vue
@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <skill-points-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></skill-points-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import SkillPointsForm from './SkillPointsForm'
+  export default {
+    name: 'SkillPointsModal',
+    components: {
+      SkillPointsForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/skillPoints/modules/SkillPointsModal__Style#Drawer.vue b/ant-design-vue-jeecg/src/views/skillPoints/modules/SkillPointsModal__Style#Drawer.vue
new file mode 100644
index 0000000..2cf82ed
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/skillPoints/modules/SkillPointsModal__Style#Drawer.vue
@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <skill-points-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></skill-points-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import SkillPointsForm from './SkillPointsForm'
+
+  export default {
+    name: 'SkillPointsModal',
+    components: {
+      SkillPointsForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/vue/TablexList.vue b/ant-design-vue-jeecg/src/views/skillType/SkillTypeList.vue
similarity index 57%
rename from jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/vue/TablexList.vue
rename to ant-design-vue-jeecg/src/views/skillType/SkillTypeList.vue
index 2ce1bcb..d54b075 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/vue/TablexList.vue
+++ b/ant-design-vue-jeecg/src/views/skillType/SkillTypeList.vue
@@ -4,6 +4,17 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="类型名称">
+              <a-input placeholder="请输入类型名称" v-model="queryParam.typeName"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+            </span>
+          </a-col>
         </a-row>
       </a-form>
     </div>
@@ -12,12 +23,12 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('实体表')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
+<!--      <a-button type="primary" icon="download" @click="handleExportXls('技能类型管理')">导出</a-button>-->
+<!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+<!--        <a-button type="primary" icon="import">导入</a-button>-->
+<!--      </a-upload>-->
       <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+<!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
           <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
@@ -69,27 +80,20 @@
 
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
+          <a-divider type="vertical" />
 
+          <a @click="handleDetail(record)">详情</a>
           <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a @click="handleDetail(record)">详情</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                   <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
+          </a-popconfirm>
         </span>
 
       </a-table>
     </div>
 
-    <tablex-modal ref="modalForm" @ok="modalFormOk"></tablex-modal>
+    <skill-type-modal ref="modalForm" @ok="modalFormOk"></skill-type-modal>
   </a-card>
 </template>
 
@@ -98,18 +102,17 @@
   import '@/assets/less/TableExpand.less'
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import TablexModal from './modules/TablexModal'
-  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+  import SkillTypeModal from './modules/SkillTypeModal'
 
   export default {
-    name: 'TablexList',
+    name: 'SkillTypeList',
     mixins:[JeecgListMixin, mixinDevice],
     components: {
-      TablexModal
+      SkillTypeModal
     },
     data () {
       return {
-        description: '实体表管理页面',
+        description: '技能类型管理管理页面',
         // 表头
         columns: [
           {
@@ -123,44 +126,46 @@
             }
           },
           {
-            title:'对应模块id',
+            title:'类型名称',
             align:"center",
-            dataIndex: 'moduleId_dictText'
+            dataIndex: 'typeName'
           },
           {
-            title:'中文名称',
+            title:'父类型',
             align:"center",
-            dataIndex: 'tableName'
+            dataIndex: 'supertypeId_dictText'
           },
           {
-            title:'英文名称',
+            title:'描述',
             align:"center",
-            dataIndex: 'tableEnName'
+            dataIndex: 'skillDesc',
+            scopedSlots: {customRender: 'htmlSlot'}
           },
           {
-            title:'表结构SQL',
+            title:'图标',
             align:"center",
-            dataIndex: 'tableStructure'
+            dataIndex: 'skillIcon',
+            scopedSlots: {customRender: 'imgSlot'}
           },
           {
-            title:'结构图',
+            title:'创建人',
             align:"center",
-            dataIndex: 'structuralDiagram'
+            dataIndex: 'createBy'
           },
           {
-            title:'实体状态',
+            title:'创建时间',
             align:"center",
-            dataIndex: 'status'
+            dataIndex: 'createTime'
           },
           {
-            title:'版本状态',
+            title:'修改人',
             align:"center",
-            dataIndex: 'verisonStatus'
+            dataIndex: 'updateBy'
           },
           {
-            title:'版本号',
+            title:'修改时间',
             align:"center",
-            dataIndex: 'verison'
+            dataIndex: 'updateTime'
           },
           {
             title: '操作',
@@ -172,11 +177,11 @@
           }
         ],
         url: {
-          list: "/tablex/tablex/list",
-          delete: "/tablex/tablex/delete",
-          deleteBatch: "/tablex/tablex/deleteBatch",
-          exportXlsUrl: "/tablex/tablex/exportXls",
-          importExcelUrl: "tablex/tablex/importExcel",
+          list: "/skillType/skillType/list",
+          delete: "/skillType/skillType/delete",
+          deleteBatch: "/skillType/skillType/deleteBatch",
+          exportXlsUrl: "/skillType/skillType/exportXls",
+          importExcelUrl: "skillType/skillType/importExcel",
           
         },
         dictOptions:{},
@@ -196,14 +201,14 @@
       },
       getSuperFieldList(){
         let fieldList=[];
-        fieldList.push({type:'sel_search',value:'moduleId',text:'对应模块id',dictTable:'modulex', dictText:'module_name', dictCode:'id'})
-        fieldList.push({type:'string',value:'tableName',text:'中文名称',dictCode:''})
-        fieldList.push({type:'string',value:'tableEnName',text:'英文名称',dictCode:''})
-        fieldList.push({type:'string',value:'tableStructure',text:'表结构SQL',dictCode:''})
-        fieldList.push({type:'string',value:'structuralDiagram',text:'结构图',dictCode:''})
-        fieldList.push({type:'int',value:'status',text:'实体状态',dictCode:''})
-        fieldList.push({type:'int',value:'verisonStatus',text:'版本状态',dictCode:''})
-        fieldList.push({type:'int',value:'verison',text:'版本号',dictCode:''})
+        fieldList.push({type:'string',value:'typeName',text:'类型名称',dictCode:''})
+        fieldList.push({type:'string',value:'supertypeId',text:'父类型id',dictCode:''})
+        fieldList.push({type:'string',value:'skillDesc',text:'描述',dictCode:''})
+        fieldList.push({type:'string',value:'skillIcon',text:'图标',dictCode:''})
+        fieldList.push({type:'string',value:'createBy',text:'创建人',dictCode:''})
+        fieldList.push({type:'datetime',value:'createTime',text:'创建时间'})
+        fieldList.push({type:'string',value:'updateBy',text:'修改人',dictCode:''})
+        fieldList.push({type:'datetime',value:'updateTime',text:'修改时间'})
         this.superFieldList = fieldList
       }
     }
diff --git a/ant-design-vue-jeecg/src/views/skillType/modules/SkillTypeForm.vue b/ant-design-vue-jeecg/src/views/skillType/modules/SkillTypeForm.vue
new file mode 100644
index 0000000..042a6d4
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/skillType/modules/SkillTypeForm.vue
@@ -0,0 +1,119 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="父类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="supertypeId">
+              <j-search-select-tag v-model="model.supertypeId" dict="skill_type,type_name,id" placeholder="请选择父类型"  ></j-search-select-tag>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="类型名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="typeName">
+              <a-input v-model="model.typeName" placeholder="请输入类型名称"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="skillDesc">
+              <j-editor v-model="model.skillDesc" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="图标" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="skillIcon">
+              <j-image-upload isMultiple  v-model="model.skillIcon" ></j-image-upload>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'SkillTypeForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/skillType/skillType/add",
+          edit: "/skillType/skillType/edit",
+          queryById: "/skillType/skillType/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/vue/modules/TablexModal.vue b/ant-design-vue-jeecg/src/views/skillType/modules/SkillTypeModal.vue
similarity index 83%
rename from jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/vue/modules/TablexModal.vue
rename to ant-design-vue-jeecg/src/views/skillType/modules/SkillTypeModal.vue
index 1d093d5..d8aaf77 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/vue/modules/TablexModal.vue
+++ b/ant-design-vue-jeecg/src/views/skillType/modules/SkillTypeModal.vue
@@ -8,17 +8,17 @@
     :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
     @cancel="handleCancel"
     cancelText="关闭">
-    <tablex-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></tablex-form>
+    <skill-type-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></skill-type-form>
   </j-modal>
 </template>
 
 <script>
 
-  import TablexForm from './TablexForm'
+  import SkillTypeForm from './SkillTypeForm'
   export default {
-    name: 'TablexModal',
+    name: 'SkillTypeModal',
     components: {
-      TablexForm
+      SkillTypeForm
     },
     data () {
       return {
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/fieldx/vue/modules/FieldxModal__Style#Drawer.vue b/ant-design-vue-jeecg/src/views/skillType/modules/SkillTypeModal__Style#Drawer.vue
similarity index 88%
rename from jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/fieldx/vue/modules/FieldxModal__Style#Drawer.vue
rename to ant-design-vue-jeecg/src/views/skillType/modules/SkillTypeModal__Style#Drawer.vue
index 31dd74f..e65b4e8 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/fieldx/vue/modules/FieldxModal__Style#Drawer.vue
+++ b/ant-design-vue-jeecg/src/views/skillType/modules/SkillTypeModal__Style#Drawer.vue
@@ -7,7 +7,7 @@
     @close="close"
     destroyOnClose
     :visible="visible">
-    <fieldx-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></fieldx-form>
+    <skill-type-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></skill-type-form>
     <div class="drawer-footer">
       <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
       <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
@@ -17,12 +17,12 @@
 
 <script>
 
-  import FieldxForm from './FieldxForm'
+  import SkillTypeForm from './SkillTypeForm'
 
   export default {
-    name: 'FieldxModal',
+    name: 'SkillTypeModal',
     components: {
-      FieldxForm
+      SkillTypeForm
     },
     data () {
       return {
diff --git a/ant-design-vue-jeecg/src/views/taskSkill/TaskSkillList.vue b/ant-design-vue-jeecg/src/views/taskSkill/TaskSkillList.vue
new file mode 100644
index 0000000..b67a1ac
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/taskSkill/TaskSkillList.vue
@@ -0,0 +1,178 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+<!--      <a-button type="primary" icon="download" @click="handleExportXls('任务技能管理')">导出</a-button>-->
+<!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+<!--        <a-button type="primary" icon="import">导入</a-button>-->
+<!--      </a-upload>-->
+      <!-- 高级查询区域 -->
+<!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+          <a-divider type="vertical" />
+
+          <a @click="handleDetail(record)">详情</a>
+          <a-divider type="vertical" />
+
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+          </a-popconfirm>
+
+        </span>
+
+      </a-table>
+    </div>
+
+    <task-skill-modal ref="modalForm" @ok="modalFormOk"></task-skill-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import TaskSkillModal from './modules/TaskSkillModal'
+
+  export default {
+    name: 'TaskSkillList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      TaskSkillModal
+    },
+    data () {
+      return {
+        description: '任务技能管理管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'任务类型',
+            align:"center",
+            dataIndex: 'taskType_dictText'
+          },
+          {
+            title:'任务',
+            align:"center",
+            dataIndex: 'taskId_dictText'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/taskSkill/taskSkill/list",
+          delete: "/taskSkill/taskSkill/delete",
+          deleteBatch: "/taskSkill/taskSkill/deleteBatch",
+          exportXlsUrl: "/taskSkill/taskSkill/exportXls",
+          importExcelUrl: "taskSkill/taskSkill/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'int',value:'taskType',text:'任务类型',dictCode:''})
+        fieldList.push({type:'string',value:'taskId',text:'任务id',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/taskSkill/modules/TaskSkillForm.vue b/ant-design-vue-jeecg/src/views/taskSkill/modules/TaskSkillForm.vue
new file mode 100644
index 0000000..83ef214
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/taskSkill/modules/TaskSkillForm.vue
@@ -0,0 +1,138 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="技能点" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="skillId">
+              <j-dict-select-tag v-model="model.skillId" dictCode="skill_points,skill_name,id" placeholder="请选择技能点" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="任务类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="taskType">
+              <j-dict-select-tag v-model="model.taskType" dictCode="task_type" @change="settask" placeholder="请选择任务类型" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="任务" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="taskId">
+              <j-dict-select-tag v-model="model.taskId" :dictCode="taskdict" placeholder="请选择任务"  ></j-dict-select-tag>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'TaskSkillForm',
+    components: {
+      taskType:''
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        taskdict:"a,a,a",
+        model:{
+          taskId:'',
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+          skillId: [
+            { required: true, message: '请选择技能点!'},
+          ],
+           taskType: [
+              { required: true, message: '请选择任务类型!'},
+           ],
+           taskId: [
+              { required: true, message: '请选择任务!'},
+           ],
+        },
+        url: {
+          add: "/taskSkill/taskSkill/add",
+          edit: "/taskSkill/taskSkill/edit",
+          queryById: "/taskSkill/taskSkill/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      settask() {
+        if(this.model.taskType == '0'){
+        this.taskdict="projectx,project_name,id"
+      }else if(this.model.taskType == '1'){
+          this.taskdict="modulex,module_name,id"
+        }else if(this.model.taskType == '2'){
+          this.taskdict="functionx,function_name,id"
+        }else if(this.model.taskType == '3'){
+          this.taskdict="rulex,rule_code,id"
+        }else { this.taskdict=""}
+        this.model.taskId='';
+      },
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/fieldx/vue/modules/FieldxModal.vue b/ant-design-vue-jeecg/src/views/taskSkill/modules/TaskSkillModal.vue
similarity index 83%
rename from jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/fieldx/vue/modules/FieldxModal.vue
rename to ant-design-vue-jeecg/src/views/taskSkill/modules/TaskSkillModal.vue
index 60f7968..d8d9f76 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/fieldx/vue/modules/FieldxModal.vue
+++ b/ant-design-vue-jeecg/src/views/taskSkill/modules/TaskSkillModal.vue
@@ -8,17 +8,17 @@
     :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
     @cancel="handleCancel"
     cancelText="关闭">
-    <fieldx-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></fieldx-form>
+    <task-skill-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></task-skill-form>
   </j-modal>
 </template>
 
 <script>
 
-  import FieldxForm from './FieldxForm'
+  import TaskSkillForm from './TaskSkillForm'
   export default {
-    name: 'FieldxModal',
+    name: 'TaskSkillModal',
     components: {
-      FieldxForm
+      TaskSkillForm
     },
     data () {
       return {
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/vue/modules/TablexModal__Style#Drawer.vue b/ant-design-vue-jeecg/src/views/taskSkill/modules/TaskSkillModal__Style#Drawer.vue
similarity index 88%
rename from jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/vue/modules/TablexModal__Style#Drawer.vue
rename to ant-design-vue-jeecg/src/views/taskSkill/modules/TaskSkillModal__Style#Drawer.vue
index 88cc347..7231cb1 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/vue/modules/TablexModal__Style#Drawer.vue
+++ b/ant-design-vue-jeecg/src/views/taskSkill/modules/TaskSkillModal__Style#Drawer.vue
@@ -7,7 +7,7 @@
     @close="close"
     destroyOnClose
     :visible="visible">
-    <tablex-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></tablex-form>
+    <task-skill-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></task-skill-form>
     <div class="drawer-footer">
       <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
       <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
@@ -17,12 +17,12 @@
 
 <script>
 
-  import TablexForm from './TablexForm'
+  import TaskSkillForm from './TaskSkillForm'
 
   export default {
-    name: 'TablexModal',
+    name: 'TaskSkillModal',
     components: {
-      TablexForm
+      TaskSkillForm
     },
     data () {
       return {
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/skillPoints/controller/SkillPointsController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/skillPoints/controller/SkillPointsController.java
new file mode 100644
index 0000000..f9eb799
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/skillPoints/controller/SkillPointsController.java
@@ -0,0 +1,179 @@
+package org.jeecg.modules.skillPoints.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.skillPoints.entity.SkillPoints;
+import org.jeecg.modules.skillPoints.service.ISkillPointsService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 技能点管理
+ * @Author: jeecg-boot
+ * @Date:   2023-05-08
+ * @Version: V1.0
+ */
+@Api(tags="技能点管理")
+@RestController
+@RequestMapping("/skillPoints/skillPoints")
+@Slf4j
+public class SkillPointsController extends JeecgController<SkillPoints, ISkillPointsService> {
+	@Autowired
+	private ISkillPointsService skillPointsService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param skillPoints
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "技能点管理-分页列表查询")
+	@ApiOperation(value="技能点管理-分页列表查询", notes="技能点管理-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<?> queryPageList(SkillPoints skillPoints,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<SkillPoints> queryWrapper = QueryGenerator.initQueryWrapper(skillPoints, req.getParameterMap());
+		Page<SkillPoints> page = new Page<SkillPoints>(pageNo, pageSize);
+		IPage<SkillPoints> pageList = skillPointsService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param skillPoints
+	 * @return
+	 */
+	@AutoLog(value = "技能点管理-添加")
+	@ApiOperation(value="技能点管理-添加", notes="技能点管理-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@RequestBody SkillPoints skillPoints) {
+		String code = "";
+		SkillPoints skillPoints1 = skillPointsService.getOne(new QueryWrapper<SkillPoints>().lambda().orderByDesc(SkillPoints::getSkillCode));
+		if (skillPoints1 == null){
+			code = "J0000000001";
+		}else {
+			code = skillPoints1.getSkillCode()+1;
+		}
+		System.out.println(code);
+		skillPointsService.save(skillPoints);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param skillPoints
+	 * @return
+	 */
+	@AutoLog(value = "技能点管理-编辑")
+	@ApiOperation(value="技能点管理-编辑", notes="技能点管理-编辑")
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@RequestBody SkillPoints skillPoints) {
+		skillPointsService.updateById(skillPoints);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "技能点管理-通过id删除")
+	@ApiOperation(value="技能点管理-通过id删除", notes="技能点管理-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		skillPointsService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "技能点管理-批量删除")
+	@ApiOperation(value="技能点管理-批量删除", notes="技能点管理-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.skillPointsService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "技能点管理-通过id查询")
+	@ApiOperation(value="技能点管理-通过id查询", notes="技能点管理-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+		SkillPoints skillPoints = skillPointsService.getById(id);
+		if(skillPoints==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(skillPoints);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param skillPoints
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, SkillPoints skillPoints) {
+        return super.exportXls(request, skillPoints, SkillPoints.class, "技能点管理");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, SkillPoints.class);
+    }
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/skillPoints/entity/SkillPoints.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/skillPoints/entity/SkillPoints.java
new file mode 100644
index 0000000..a30e489
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/skillPoints/entity/SkillPoints.java
@@ -0,0 +1,90 @@
+package org.jeecg.modules.skillPoints.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 技能点管理
+ * @Author: jeecg-boot
+ * @Date:   2023-05-08
+ * @Version: V1.0
+ */
+@Data
+@TableName("skill_points")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="skill_points对象", description="技能点管理")
+public class SkillPoints implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**编码*/
+	@Excel(name = "编码", width = 15)
+    @ApiModelProperty(value = "编码")
+    private java.lang.String skillCode;
+	/**类型*/
+	@Excel(name = "类型", width = 15)
+    @ApiModelProperty(value = "类型")
+    @Dict(dictTable = "skill_type",dicText = "type_name",dicCode = "id")
+    private java.lang.Integer skillType;
+	/**技能点名称*/
+	@Excel(name = "技能点名称", width = 15)
+    @ApiModelProperty(value = "技能点名称")
+    private java.lang.String skillName;
+	/**等级*/
+	@Excel(name = "等级", width = 15)
+    @ApiModelProperty(value = "等级")
+    private java.lang.Integer skillLevel;
+	/**描述*/
+	@Excel(name = "描述", width = 15)
+    @ApiModelProperty(value = "描述")
+    private java.lang.String skillDesc;
+	/**图标*/
+	@Excel(name = "图标", width = 15)
+    @ApiModelProperty(value = "图标")
+    private java.lang.String skillIcon;
+	/**图片*/
+	@Excel(name = "图片", width = 15)
+    @ApiModelProperty(value = "图片")
+    private java.lang.String skillPic;
+	/**技能点状态*/
+	@Excel(name = "技能点状态", width = 15)
+    @ApiModelProperty(value = "技能点状态")
+    @Dict(dicCode = "skill_status")
+    private java.lang.Integer skillStatus;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    @Dict(dictTable = "sys_user", dicText = "username", dicCode = "id")
+    private java.lang.String createBy;
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "修改人")
+    @Dict(dictTable = "sys_user", dicText = "username", dicCode = "id")
+    private java.lang.String updateBy;
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/skillPoints/mapper/SkillPointsMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/skillPoints/mapper/SkillPointsMapper.java
new file mode 100644
index 0000000..d7e8a83
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/skillPoints/mapper/SkillPointsMapper.java
@@ -0,0 +1,17 @@
+package org.jeecg.modules.skillPoints.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.skillPoints.entity.SkillPoints;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 技能点管理
+ * @Author: jeecg-boot
+ * @Date:   2023-05-08
+ * @Version: V1.0
+ */
+public interface SkillPointsMapper extends BaseMapper<SkillPoints> {
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/skillPoints/mapper/xml/SkillPointsMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/skillPoints/mapper/xml/SkillPointsMapper.xml
new file mode 100644
index 0000000..aef1fa7
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/skillPoints/mapper/xml/SkillPointsMapper.xml
@@ -0,0 +1,5 @@
+<?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=".skillPoints.mapper.SkillPointsMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/skillPoints/service/ISkillPointsService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/skillPoints/service/ISkillPointsService.java
new file mode 100644
index 0000000..0aeff80
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/skillPoints/service/ISkillPointsService.java
@@ -0,0 +1,14 @@
+package org.jeecg.modules.skillPoints.service;
+
+import org.jeecg.modules.skillPoints.entity.SkillPoints;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 技能点管理
+ * @Author: jeecg-boot
+ * @Date:   2023-05-08
+ * @Version: V1.0
+ */
+public interface ISkillPointsService extends IService<SkillPoints> {
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/skillPoints/service/impl/SkillPointsServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/skillPoints/service/impl/SkillPointsServiceImpl.java
new file mode 100644
index 0000000..f586546
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/skillPoints/service/impl/SkillPointsServiceImpl.java
@@ -0,0 +1,19 @@
+package org.jeecg.modules.skillPoints.service.impl;
+
+import org.jeecg.modules.skillPoints.entity.SkillPoints;
+import org.jeecg.modules.skillPoints.mapper.SkillPointsMapper;
+import org.jeecg.modules.skillPoints.service.ISkillPointsService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 技能点管理
+ * @Author: jeecg-boot
+ * @Date:   2023-05-08
+ * @Version: V1.0
+ */
+@Service
+public class SkillPointsServiceImpl extends ServiceImpl<SkillPointsMapper, SkillPoints> implements ISkillPointsService {
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/skillType/controller/SkillTypeController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/skillType/controller/SkillTypeController.java
new file mode 100644
index 0000000..1427545
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/skillType/controller/SkillTypeController.java
@@ -0,0 +1,179 @@
+package org.jeecg.modules.skillType.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.skillType.entity.SkillType;
+import org.jeecg.modules.skillType.service.ISkillTypeService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 技能类型管理
+ * @Author: jeecg-boot
+ * @Date:   2023-05-08
+ * @Version: V1.0
+ */
+@Api(tags="技能类型管理")
+@RestController
+@RequestMapping("/skillType/skillType")
+@Slf4j
+public class SkillTypeController extends JeecgController<SkillType, ISkillTypeService> {
+	@Autowired
+	private ISkillTypeService skillTypeService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param skillType
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "技能类型管理-分页列表查询")
+	@ApiOperation(value="技能类型管理-分页列表查询", notes="技能类型管理-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<?> queryPageList(SkillType skillType,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<SkillType> queryWrapper = QueryGenerator.initQueryWrapper(skillType, req.getParameterMap());
+		Page<SkillType> page = new Page<SkillType>(pageNo, pageSize);
+		IPage<SkillType> pageList = skillTypeService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param skillType
+	 * @return
+	 */
+	@AutoLog(value = "技能类型管理-添加")
+	@ApiOperation(value="技能类型管理-添加", notes="技能类型管理-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@RequestBody SkillType skillType) {
+		if (skillType.getSupertypeId() == null){
+			skillType.setSupertypeId("-1");
+		}
+		skillTypeService.save(skillType);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param skillType
+	 * @return
+	 */
+	@AutoLog(value = "技能类型管理-编辑")
+	@ApiOperation(value="技能类型管理-编辑", notes="技能类型管理-编辑")
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@RequestBody SkillType skillType) {
+		skillTypeService.updateById(skillType);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "技能类型管理-通过id删除")
+	@ApiOperation(value="技能类型管理-通过id删除", notes="技能类型管理-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		SkillType skillType = skillTypeService.getById(id);
+		List<SkillType> list = skillTypeService.list(new QueryWrapper<SkillType>().lambda().eq(SkillType::getSupertypeId, skillType.getId()));
+		if (!list.isEmpty()){
+			return Result.error("该类型有子类型，无法删除");
+		}
+		skillTypeService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "技能类型管理-批量删除")
+	@ApiOperation(value="技能类型管理-批量删除", notes="技能类型管理-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.skillTypeService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "技能类型管理-通过id查询")
+	@ApiOperation(value="技能类型管理-通过id查询", notes="技能类型管理-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+		SkillType skillType = skillTypeService.getById(id);
+		if(skillType==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(skillType);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param skillType
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, SkillType skillType) {
+        return super.exportXls(request, skillType, SkillType.class, "技能类型管理");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, SkillType.class);
+    }
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/skillType/entity/SkillType.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/skillType/entity/SkillType.java
new file mode 100644
index 0000000..d40a459
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/skillType/entity/SkillType.java
@@ -0,0 +1,73 @@
+package org.jeecg.modules.skillType.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 技能类型管理
+ * @Author: jeecg-boot
+ * @Date:   2023-05-08
+ * @Version: V1.0
+ */
+@Data
+@TableName("skill_type")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="skill_type对象", description="技能类型管理")
+public class SkillType implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**类型名称*/
+	@Excel(name = "类型名称", width = 15)
+    @ApiModelProperty(value = "类型名称")
+    private java.lang.String typeName;
+	/**父类型id*/
+	@Excel(name = "父类型id", width = 15)
+    @ApiModelProperty(value = "父类型id")
+    @Dict(dictTable = "skill_type",dicText = "type_name",dicCode = "id")
+    private java.lang.String supertypeId;
+	/**描述*/
+	@Excel(name = "描述", width = 15)
+    @ApiModelProperty(value = "描述")
+    private java.lang.String skillDesc;
+	/**图标*/
+	@Excel(name = "图标", width = 15)
+    @ApiModelProperty(value = "图标")
+    private java.lang.String skillIcon;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    @Dict(dictTable = "sys_user", dicText = "username", dicCode = "id")
+    private java.lang.String createBy;
+	/**创建时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建时间")
+    private java.util.Date createTime;
+	/**修改人*/
+    @ApiModelProperty(value = "修改人")
+    @Dict(dictTable = "sys_user", dicText = "username", dicCode = "id")
+    private java.lang.String updateBy;
+	/**修改时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "修改时间")
+    private java.util.Date updateTime;
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/skillType/mapper/SkillTypeMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/skillType/mapper/SkillTypeMapper.java
new file mode 100644
index 0000000..daed064
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/skillType/mapper/SkillTypeMapper.java
@@ -0,0 +1,17 @@
+package org.jeecg.modules.skillType.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.skillType.entity.SkillType;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 技能类型管理
+ * @Author: jeecg-boot
+ * @Date:   2023-05-08
+ * @Version: V1.0
+ */
+public interface SkillTypeMapper extends BaseMapper<SkillType> {
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/skillType/mapper/xml/SkillTypeMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/skillType/mapper/xml/SkillTypeMapper.xml
new file mode 100644
index 0000000..4b9d4b1
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/skillType/mapper/xml/SkillTypeMapper.xml
@@ -0,0 +1,5 @@
+<?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=".skillType.mapper.SkillTypeMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/skillType/service/ISkillTypeService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/skillType/service/ISkillTypeService.java
new file mode 100644
index 0000000..ee118c4
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/skillType/service/ISkillTypeService.java
@@ -0,0 +1,14 @@
+package org.jeecg.modules.skillType.service;
+
+import org.jeecg.modules.skillType.entity.SkillType;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 技能类型管理
+ * @Author: jeecg-boot
+ * @Date:   2023-05-08
+ * @Version: V1.0
+ */
+public interface ISkillTypeService extends IService<SkillType> {
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/skillType/service/impl/SkillTypeServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/skillType/service/impl/SkillTypeServiceImpl.java
new file mode 100644
index 0000000..68a2bf5
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/skillType/service/impl/SkillTypeServiceImpl.java
@@ -0,0 +1,19 @@
+package org.jeecg.modules.skillType.service.impl;
+
+import org.jeecg.modules.skillType.entity.SkillType;
+import org.jeecg.modules.skillType.mapper.SkillTypeMapper;
+import org.jeecg.modules.skillType.service.ISkillTypeService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 技能类型管理
+ * @Author: jeecg-boot
+ * @Date:   2023-05-08
+ * @Version: V1.0
+ */
+@Service
+public class SkillTypeServiceImpl extends ServiceImpl<SkillTypeMapper, SkillType> implements ISkillTypeService {
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/taskSkill/controller/TaskSkillController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/taskSkill/controller/TaskSkillController.java
new file mode 100644
index 0000000..3bd5f01
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/taskSkill/controller/TaskSkillController.java
@@ -0,0 +1,171 @@
+package org.jeecg.modules.taskSkill.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.taskSkill.entity.TaskSkill;
+import org.jeecg.modules.taskSkill.service.ITaskSkillService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 任务技能管理
+ * @Author: jeecg-boot
+ * @Date:   2023-05-08
+ * @Version: V1.0
+ */
+@Api(tags="任务技能管理")
+@RestController
+@RequestMapping("/taskSkill/taskSkill")
+@Slf4j
+public class TaskSkillController extends JeecgController<TaskSkill, ITaskSkillService> {
+	@Autowired
+	private ITaskSkillService taskSkillService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param taskSkill
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "任务技能管理-分页列表查询")
+	@ApiOperation(value="任务技能管理-分页列表查询", notes="任务技能管理-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<?> queryPageList(TaskSkill taskSkill,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<TaskSkill> queryWrapper = QueryGenerator.initQueryWrapper(taskSkill, req.getParameterMap());
+		Page<TaskSkill> page = new Page<TaskSkill>(pageNo, pageSize);
+		IPage<TaskSkill> pageList = taskSkillService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param taskSkill
+	 * @return
+	 */
+	@AutoLog(value = "任务技能管理-添加")
+	@ApiOperation(value="任务技能管理-添加", notes="任务技能管理-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@RequestBody TaskSkill taskSkill) {
+		taskSkillService.save(taskSkill);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param taskSkill
+	 * @return
+	 */
+	@AutoLog(value = "任务技能管理-编辑")
+	@ApiOperation(value="任务技能管理-编辑", notes="任务技能管理-编辑")
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@RequestBody TaskSkill taskSkill) {
+		taskSkillService.updateById(taskSkill);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "任务技能管理-通过id删除")
+	@ApiOperation(value="任务技能管理-通过id删除", notes="任务技能管理-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		taskSkillService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "任务技能管理-批量删除")
+	@ApiOperation(value="任务技能管理-批量删除", notes="任务技能管理-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.taskSkillService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "任务技能管理-通过id查询")
+	@ApiOperation(value="任务技能管理-通过id查询", notes="任务技能管理-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+		TaskSkill taskSkill = taskSkillService.getById(id);
+		if(taskSkill==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(taskSkill);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param taskSkill
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, TaskSkill taskSkill) {
+        return super.exportXls(request, taskSkill, TaskSkill.class, "任务技能管理");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, TaskSkill.class);
+    }
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/taskSkill/entity/TaskSkill.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/taskSkill/entity/TaskSkill.java
new file mode 100644
index 0000000..2083a14
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/taskSkill/entity/TaskSkill.java
@@ -0,0 +1,70 @@
+package org.jeecg.modules.taskSkill.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 任务技能管理
+ * @Author: jeecg-boot
+ * @Date:   2023-05-08
+ * @Version: V1.0
+ */
+@Data
+@TableName("task_skill")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="task_skill对象", description="任务技能管理")
+public class TaskSkill implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**技能点id*/
+	@Excel(name = "技能点id", width = 15)
+    @ApiModelProperty(value = "技能点id")
+    @Dict(dictTable = "skill_points", dicText = "skill_name", dicCode = "id")
+    private java.lang.String skillId;
+	/**任务类型*/
+	@Excel(name = "任务类型", width = 15)
+    @ApiModelProperty(value = "任务类型")
+    @Dict(dicCode = "task_type")
+    private java.lang.Integer taskType;
+	/**任务id*/
+	@Excel(name = "任务id", width = 15)
+    @ApiModelProperty(value = "任务id")
+    private java.lang.String taskId;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    @Dict(dictTable = "sys_user", dicText = "username", dicCode = "id")
+    private java.lang.String createBy;
+	/**创建时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建时间")
+    private java.util.Date createTime;
+	/**修改人*/
+    @ApiModelProperty(value = "修改人")
+    @Dict(dictTable = "sys_user", dicText = "username", dicCode = "id")
+    private java.lang.String updateBy;
+	/**修改时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "修改时间")
+    private java.util.Date updateTime;
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/taskSkill/mapper/TaskSkillMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/taskSkill/mapper/TaskSkillMapper.java
new file mode 100644
index 0000000..cbf8138
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/taskSkill/mapper/TaskSkillMapper.java
@@ -0,0 +1,17 @@
+package org.jeecg.modules.taskSkill.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.taskSkill.entity.TaskSkill;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 任务技能管理
+ * @Author: jeecg-boot
+ * @Date:   2023-05-08
+ * @Version: V1.0
+ */
+public interface TaskSkillMapper extends BaseMapper<TaskSkill> {
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/taskSkill/mapper/xml/TaskSkillMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/taskSkill/mapper/xml/TaskSkillMapper.xml
new file mode 100644
index 0000000..b3d8064
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/taskSkill/mapper/xml/TaskSkillMapper.xml
@@ -0,0 +1,5 @@
+<?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=".taskSkill.mapper.TaskSkillMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/taskSkill/service/ITaskSkillService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/taskSkill/service/ITaskSkillService.java
new file mode 100644
index 0000000..28eb2aa
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/taskSkill/service/ITaskSkillService.java
@@ -0,0 +1,14 @@
+package org.jeecg.modules.taskSkill.service;
+
+import org.jeecg.modules.taskSkill.entity.TaskSkill;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 任务技能管理
+ * @Author: jeecg-boot
+ * @Date:   2023-05-08
+ * @Version: V1.0
+ */
+public interface ITaskSkillService extends IService<TaskSkill> {
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/taskSkill/service/impl/TaskSkillServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/taskSkill/service/impl/TaskSkillServiceImpl.java
new file mode 100644
index 0000000..58007ce
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/taskSkill/service/impl/TaskSkillServiceImpl.java
@@ -0,0 +1,19 @@
+package org.jeecg.modules.taskSkill.service.impl;
+
+import org.jeecg.modules.taskSkill.entity.TaskSkill;
+import org.jeecg.modules.taskSkill.mapper.TaskSkillMapper;
+import org.jeecg.modules.taskSkill.service.ITaskSkillService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 任务技能管理
+ * @Author: jeecg-boot
+ * @Date:   2023-05-08
+ * @Version: V1.0
+ */
+@Service
+public class TaskSkillServiceImpl extends ServiceImpl<TaskSkillMapper, TaskSkill> implements ITaskSkillService {
+
+}