diff --git a/admin-hanhai-vue/src/views/userRole/TbUserRoleList.vue b/admin-hanhai-vue/src/views/userRole/TbUserRoleList.vue
index 6469cd5..27b43e0 100644
--- a/admin-hanhai-vue/src/views/userRole/TbUserRoleList.vue
+++ b/admin-hanhai-vue/src/views/userRole/TbUserRoleList.vue
@@ -5,32 +5,15 @@
       <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="角色身份">
-              <j-dict-select-tag placeholder="请选择角色身份" v-model="queryParam.role" dictCode="user_role"/>
+            <a-form-item label="电话">
+              <a-input placeholder="请输入电话" v-model="queryParam.phone"></a-input>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="用户名">
-              <a-input placeholder="请输入用户名" v-model="queryParam.userName"></a-input>
+            <a-form-item label="审核状态 0审核中 1 审核通过 2审核未通过">
+              <j-dict-select-tag placeholder="请选择审核状态 0审核中 1 审核通过 2审核未通过" v-model="queryParam.auditStatus" dictCode="audit_status"/>
             </a-form-item>
           </a-col>
-          <template v-if="toggleSearchStatus">
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="公司名称">
-                <a-input placeholder="请输入公司名称" v-model="queryParam.companyName"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="电话">
-                <a-input placeholder="请输入电话" v-model="queryParam.phone"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="审核状态">
-                <j-dict-select-tag placeholder="请选择审核状态" v-model="queryParam.auditStatus" dictCode="audit_status"/>
-              </a-form-item>
-            </a-col>
-          </template>
           <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>
@@ -49,7 +32,7 @@
     <!-- 操作按钮区域 -->
     <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-button type="primary" icon="download" @click="handleExportXls('tb_user_role')">导出</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>
@@ -146,7 +129,7 @@
     },
     data () {
       return {
-        description: '角色表管理页面',
+        description: 'tb_user_role管理页面',
         // 表头
         columns: [
           {
@@ -159,11 +142,6 @@
               return parseInt(index)+1;
             }
           },
-          {
-            title:'角色身份',
-            align:"center",
-            dataIndex: 'role_dictText'
-          },
           {
             title:'用户名',
             align:"center",
@@ -175,19 +153,20 @@
             dataIndex: 'companyName'
           },
           {
-            title:'税收编码',
+            title:'地址',
             align:"center",
-            dataIndex: 'taxCode'
+            dataIndex: 'companyAddress'
           },
           {
-            title:'公司地址',
+            title:'行业',
             align:"center",
-            dataIndex: 'address'
+            dataIndex: 'industryName'
           },
           {
-            title:'公司账号',
+            title:'身份证上传',
             align:"center",
-            dataIndex: 'bankAccount'
+            dataIndex: 'idcard',
+            scopedSlots: {customRender: 'imgSlot'}
           },
           {
             title:'电话',
@@ -195,9 +174,9 @@
             dataIndex: 'phone'
           },
           {
-            title:'开户行',
+            title:'角色',
             align:"center",
-            dataIndex: 'bankNama'
+            dataIndex: 'role_dictText'
           },
           {
             title:'营业执照上传',
@@ -206,19 +185,7 @@
             scopedSlots: {customRender: 'imgSlot'}
           },
           {
-            title:'基本户信息照片上传',
-            align:"center",
-            dataIndex: 'basicAccount',
-            scopedSlots: {customRender: 'imgSlot'}
-          },
-          {
-            title:'收款银行照片上传',
-            align:"center",
-            dataIndex: 'bankInfo',
-            scopedSlots: {customRender: 'imgSlot'}
-          },
-          {
-            title:'审核状态',
+            title:'审核状态 0审核中 1 审核通过 2审核未通过',
             align:"center",
             dataIndex: 'auditStatus_dictText'
           },
@@ -237,7 +204,7 @@
           deleteBatch: "/userRole/tbUserRole/deleteBatch",
           exportXlsUrl: "/userRole/tbUserRole/exportXls",
           importExcelUrl: "userRole/tbUserRole/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],
@@ -256,18 +223,21 @@
       },
       getSuperFieldList(){
         let fieldList=[];
-        fieldList.push({type:'int',value:'role',text:'角色信息',dictCode:'user_role'})
         fieldList.push({type:'string',value:'userName',text:'用户名',dictCode:''})
         fieldList.push({type:'string',value:'companyName',text:'公司名称',dictCode:''})
-        fieldList.push({type:'string',value:'taxCode',text:'税收编码',dictCode:''})
-        fieldList.push({type:'string',value:'address',text:'公司地址',dictCode:''})
-        fieldList.push({type:'string',value:'bankAccount',text:'公司账号',dictCode:''})
+        fieldList.push({type:'string',value:'companyAddress',text:'地址',dictCode:''})
+        fieldList.push({type:'string',value:'address',text:'地址',dictCode:''})
+        fieldList.push({type:'string',value:'industryName',text:'行业/工种',dictCode:''})
+        fieldList.push({type:'Text',value:'detail',text:'个人简介',dictCode:''})
+        fieldList.push({type:'Text',value:'idcard',text:'身份证上传',dictCode:''})
         fieldList.push({type:'string',value:'phone',text:'电话',dictCode:''})
-        fieldList.push({type:'string',value:'bankNama',text:'开户行',dictCode:''})
+        fieldList.push({type:'int',value:'age',text:'年龄',dictCode:''})
+        fieldList.push({type:'int',value:'gender',text:'性别',dictCode:'sex'})
+        fieldList.push({type:'int',value:'moneymin',text:'期望薪资最小值',dictCode:''})
+        fieldList.push({type:'int',value:'moneymax',text:'期望薪资最大值',dictCode:''})
+        fieldList.push({type:'int',value:'role',text:'角色',dictCode:'user_role'})
         fieldList.push({type:'Text',value:'businessLicense',text:'营业执照上传',dictCode:''})
-        fieldList.push({type:'Text',value:'basicAccount',text:'基本户信息照片上传',dictCode:''})
-        fieldList.push({type:'Text',value:'bankInfo',text:'收款银行照片上传',dictCode:''})
-        fieldList.push({type:'int',value:'auditStatus',text:'审核状态 ',dictCode:'audit_status'})
+        fieldList.push({type:'int',value:'auditStatus',text:'审核状态 0审核中 1 审核通过 2审核未通过',dictCode:'audit_status'})
         this.superFieldList = fieldList
       }
     }
diff --git a/admin-hanhai-vue/src/views/userRole/modules/TbUserRoleForm.vue b/admin-hanhai-vue/src/views/userRole/modules/TbUserRoleForm.vue
index c3bb940..2efb7ff 100644
--- a/admin-hanhai-vue/src/views/userRole/modules/TbUserRoleForm.vue
+++ b/admin-hanhai-vue/src/views/userRole/modules/TbUserRoleForm.vue
@@ -3,11 +3,6 @@
     <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="role">
-              <j-dict-select-tag type="list" v-model="model.role" dictCode="user_role" placeholder="请选择角色身份" />
-            </a-form-model-item>
-          </a-col>
           <a-col :span="24">
             <a-form-model-item label="用户名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userName">
               <a-input v-model="model.userName" placeholder="请输入用户名"  ></a-input>
@@ -19,18 +14,19 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="税收编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="taxCode">
-              <a-input v-model="model.taxCode" placeholder="请输入税收编码"  ></a-input>
+            <a-form-model-item label="地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="companyAddress">
+              <a-input v-model="model.companyAddress" placeholder="请输入地址"  ></a-input>
             </a-form-model-item>
           </a-col>
+
           <a-col :span="24">
-            <a-form-model-item label="公司地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="address">
-              <a-input v-model="model.address" placeholder="请输入公司地址"  ></a-input>
+            <a-form-model-item label="行业" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="industryName">
+              <a-input v-model="model.industryName" placeholder="请输入行业"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="公司账号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bankAccount">
-              <a-input v-model="model.bankAccount" placeholder="请输入公司账号"  ></a-input>
+            <a-form-model-item label="身份证上传" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="idcard">
+              <j-image-upload isMultiple  v-model="model.idcard" ></j-image-upload>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -38,9 +34,10 @@
               <a-input v-model="model.phone" placeholder="请输入电话"  ></a-input>
             </a-form-model-item>
           </a-col>
+
           <a-col :span="24">
-            <a-form-model-item label="开户行" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bankNama">
-              <a-input v-model="model.bankNama" placeholder="请输入开户行"  ></a-input>
+            <a-form-model-item label="角色" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="role">
+              <j-dict-select-tag type="list" v-model="model.role" dictCode="user_role" placeholder="请选择角色" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -49,18 +46,8 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="基本户信息照片上传" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="basicAccount">
-              <j-image-upload isMultiple  v-model="model.basicAccount" ></j-image-upload>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="收款银行照片上传" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bankInfo">
-              <j-image-upload isMultiple  v-model="model.bankInfo" ></j-image-upload>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="审核状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="auditStatus">
-              <j-dict-select-tag type="list" v-model="model.auditStatus" dictCode="audit_status" placeholder="请选择审核状态" />
+            <a-form-model-item label="审核状态 0审核中 1 审核通过 2审核未通过" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="auditStatus">
+              <j-dict-select-tag type="list" v-model="model.auditStatus" dictCode="audit_status" placeholder="请选择审核状态 0审核中 1 审核通过 2审核未通过" />
             </a-form-model-item>
           </a-col>
         </a-row>
diff --git a/admin-hanhai-vue/src/views/userRole1/TbUserRoleList.vue b/admin-hanhai-vue/src/views/userRole1/TbUserRoleList.vue
new file mode 100644
index 0000000..3f735fc
--- /dev/null
+++ b/admin-hanhai-vue/src/views/userRole1/TbUserRoleList.vue
@@ -0,0 +1,265 @@
+<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">
+            <a-form-item label="电话">
+              <a-input placeholder="请输入电话" v-model="queryParam.phone"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="审核状态 0审核中 1 审核通过 2审核未通过">
+              <j-dict-select-tag placeholder="请选择审核状态 0审核中 1 审核通过 2审核未通过" v-model="queryParam.auditStatus" dictCode="audit_status"/>
+            </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>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </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('tb_user_role')">导出</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,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" 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-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>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <tb-user-role-modal ref="modalForm" @ok="modalFormOk"></tb-user-role-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import TbUserRoleModal from './modules/TbUserRoleModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+  export default {
+    name: 'TbUserRoleList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      TbUserRoleModal
+    },
+    data () {
+      return {
+        description: 'tb_user_role管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'用户名',
+            align:"center",
+            dataIndex: 'userName'
+          },
+
+
+          {
+            title:'地址',
+            align:"center",
+            dataIndex: 'address'
+          },
+          {
+            title:'工种',
+            align:"center",
+            dataIndex: 'industryName'
+          },
+          {
+            title:'个人简介',
+            align:"center",
+            dataIndex: 'detail'
+          },
+          {
+            title:'身份证上传',
+            align:"center",
+            dataIndex: 'idCard',
+            scopedSlots: {customRender: 'imgSlot'}
+          },
+          {
+            title:'电话',
+            align:"center",
+            dataIndex: 'phone'
+          },
+          {
+            title:'年龄',
+            align:"center",
+            dataIndex: 'age'
+          },
+          {
+            title:'性别',
+            align:"center",
+            dataIndex: 'gender_dictText'
+          },
+          {
+            title:'期望薪资最小值',
+            align:"center",
+            dataIndex: 'moneyMin'
+          },
+          {
+            title:'期望薪资最大值',
+            align:"center",
+            dataIndex: 'moneyMax'
+          },
+          {
+            title:'角色',
+            align:"center",
+            dataIndex: 'role_dictText'
+          },
+
+          {
+            title:'审核状态 0审核中 1 审核通过 2审核未通过',
+            align:"center",
+            dataIndex: 'auditStatus_dictText'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/userRole/tbUserRole/list1",
+          delete: "/userRole/tbUserRole/delete",
+          deleteBatch: "/userRole/tbUserRole/deleteBatch",
+          exportXlsUrl: "/userRole/tbUserRole/exportXls",
+          importExcelUrl: "userRole/tbUserRole/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'userName',text:'用户名',dictCode:''})
+        fieldList.push({type:'string',value:'companyName',text:'公司名称',dictCode:''})
+        fieldList.push({type:'string',value:'companyAddress',text:'地址',dictCode:''})
+        fieldList.push({type:'string',value:'address',text:'地址',dictCode:''})
+        fieldList.push({type:'string',value:'industryName',text:'行业/工种',dictCode:''})
+        fieldList.push({type:'Text',value:'detail',text:'个人简介',dictCode:''})
+        fieldList.push({type:'Text',value:'idCard',text:'身份证上传',dictCode:''})
+        fieldList.push({type:'string',value:'phone',text:'电话',dictCode:''})
+        fieldList.push({type:'int',value:'age',text:'年龄',dictCode:''})
+        fieldList.push({type:'int',value:'gender',text:'性别',dictCode:'sex'})
+        fieldList.push({type:'int',value:'moneyMin',text:'期望薪资最小值',dictCode:''})
+        fieldList.push({type:'int',value:'moneyMax',text:'期望薪资最大值',dictCode:''})
+        fieldList.push({type:'int',value:'role',text:'角色',dictCode:'user_role'})
+        fieldList.push({type:'Text',value:'businessLicense',text:'营业执照上传',dictCode:''})
+        fieldList.push({type:'int',value:'auditStatus',text:'审核状态 0审核中 1 审核通过 2审核未通过',dictCode:'audit_status'})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/admin-hanhai-vue/src/views/userRole1/modules/TbUserRoleForm.vue b/admin-hanhai-vue/src/views/userRole1/modules/TbUserRoleForm.vue
new file mode 100644
index 0000000..af7a7f5
--- /dev/null
+++ b/admin-hanhai-vue/src/views/userRole1/modules/TbUserRoleForm.vue
@@ -0,0 +1,162 @@
+<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="userName">
+              <a-input v-model="model.userName" placeholder="请输入用户名"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+
+
+          <a-col :span="24">
+            <a-form-model-item label="地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="address">
+              <a-input v-model="model.address" placeholder="请输入地址"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="工种" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="industryName">
+              <a-input v-model="model.industryName" placeholder="工种"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="个人简介" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="detail">
+              <a-textarea v-model="model.detail" rows="4" placeholder="请输入个人简介" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="身份证上传" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="idcard">
+              <j-image-upload isMultiple  v-model="model.idCard" ></j-image-upload>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">
+              <a-input v-model="model.phone" placeholder="请输入电话"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="年龄" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="age">
+              <a-input-number v-model="model.age" placeholder="请输入年龄" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="gender">
+              <j-dict-select-tag type="list" v-model="model.gender" dictCode="sex" placeholder="请选择性别" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="期望薪资最小值" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="moneymin">
+              <a-input-number v-model="model.moneyMin" placeholder="请输入期望薪资最小值" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="期望薪资最大值" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="moneymax">
+              <a-input-number v-model="model.moneyMax" placeholder="请输入期望薪资最大值" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="角色" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="role">
+              <j-dict-select-tag type="list" v-model="model.role" dictCode="user_role" placeholder="请选择角色" />
+            </a-form-model-item>
+          </a-col>
+
+          <a-col :span="24">
+            <a-form-model-item label="审核状态 0审核中 1 审核通过 2审核未通过" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="auditStatus">
+              <j-dict-select-tag type="list" v-model="model.auditStatus" dictCode="audit_status" placeholder="请选择审核状态 0审核中 1 审核通过 2审核未通过" />
+            </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: 'TbUserRoleForm',
+    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: "/userRole/tbUserRole/add",
+          edit: "/userRole/tbUserRole/edit",
+          queryById: "/userRole/tbUserRole/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/admin-hanhai-vue/src/views/userRole1/modules/TbUserRoleModal.Style#Drawer.vue b/admin-hanhai-vue/src/views/userRole1/modules/TbUserRoleModal.Style#Drawer.vue
new file mode 100644
index 0000000..8142cb1
--- /dev/null
+++ b/admin-hanhai-vue/src/views/userRole1/modules/TbUserRoleModal.Style#Drawer.vue
@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <tb-user-role-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></tb-user-role-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 TbUserRoleForm from './TbUserRoleForm'
+
+  export default {
+    name: 'TbUserRoleModal',
+    components: {
+      TbUserRoleForm
+    },
+    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/admin-hanhai-vue/src/views/userRole1/modules/TbUserRoleModal.vue b/admin-hanhai-vue/src/views/userRole1/modules/TbUserRoleModal.vue
new file mode 100644
index 0000000..9ac4966
--- /dev/null
+++ b/admin-hanhai-vue/src/views/userRole1/modules/TbUserRoleModal.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="关闭">
+    <tb-user-role-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></tb-user-role-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import TbUserRoleForm from './TbUserRoleForm'
+  export default {
+    name: 'TbUserRoleModal',
+    components: {
+      TbUserRoleForm
+    },
+    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/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/industry/controller/TbIndustryController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/industry/controller/TbIndustryController.java
index bcfa396..f575017 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/industry/controller/TbIndustryController.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/industry/controller/TbIndustryController.java
@@ -55,7 +55,8 @@ public class TbIndustryController extends JeecgController<TbIndustry, ITbIndustr
 								   HttpServletRequest req) {
 		String hasQuery = req.getParameter("hasQuery");
         if(hasQuery != null && "true".equals(hasQuery)){
-            QueryWrapper<TbIndustry> queryWrapper =  QueryGenerator.initQueryWrapper(tbIndustry, req.getParameterMap());
+			QueryWrapper<TbIndustry> queryWrapper = new QueryWrapper<>();
+			queryWrapper.eq("del_flag",0).orderByDesc("sort_no");
             List<TbIndustry> list = tbIndustryService.queryTreeListNoPage(queryWrapper);
             IPage<TbIndustry> pageList = new Page<>(1, 10, list.size());
             pageList.setRecords(list);
@@ -67,7 +68,8 @@ public class TbIndustryController extends JeecgController<TbIndustry, ITbIndustr
             }
             tbIndustry.setPid(null);
             QueryWrapper<TbIndustry> queryWrapper = QueryGenerator.initQueryWrapper(tbIndustry, req.getParameterMap());
-            // 使用 eq 防止模糊查询
+			queryWrapper.eq("del_flag",0).orderByDesc("sort_no");
+			// 使用 eq 防止模糊查询
             queryWrapper.eq("pid", parentId);
             Page<TbIndustry> page = new Page<TbIndustry>(pageNo, pageSize);
             IPage<TbIndustry> pageList = tbIndustryService.page(page, queryWrapper);
@@ -86,6 +88,7 @@ public class TbIndustryController extends JeecgController<TbIndustry, ITbIndustr
 	@GetMapping(value = "/childList")
 	public Result<IPage<TbIndustry>> queryPageList(TbIndustry tbIndustry,HttpServletRequest req) {
 		QueryWrapper<TbIndustry> queryWrapper = QueryGenerator.initQueryWrapper(tbIndustry, req.getParameterMap());
+		queryWrapper.eq("del_flag",0).orderByDesc("sort_no");
 		List<TbIndustry> list = tbIndustryService.list(queryWrapper);
 		IPage<TbIndustry> pageList = new Page<>(1, 10, list.size());
         pageList.setRecords(list);
@@ -155,7 +158,10 @@ public class TbIndustryController extends JeecgController<TbIndustry, ITbIndustr
 	@ApiOperation(value="tb_industry-通过id删除", notes="tb_industry-通过id删除")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-		tbIndustryService.deleteTbIndustry(id);
+		TbIndustry tbIndustry = new TbIndustry();
+		tbIndustry.setId(id);
+		tbIndustry.setDelFlag(1);
+		tbIndustryService.updateById(tbIndustry);
 		return Result.OK("删除成功!");
 	}
 	
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/industry/vue3/TbIndustry.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/industry/vue3/TbIndustry.api.ts
deleted file mode 100644
index 57f687a..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/industry/vue3/TbIndustry.api.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-import {defHttp} from "/@/utils/http/axios";
-import {Modal} from 'ant-design-vue';
-
-enum Api {
-  list = '/industry/tbIndustry/rootList',
-  save='/industry/tbIndustry/add',
-  edit='/industry/tbIndustry/edit',
-  deleteTbIndustry = '/sys/tbIndustry/delete',
-  deleteBatch = '/industry/tbIndustry/deleteBatch',
-  importExcel = '/industry/tbIndustry/importExcel',
-  exportXls = '/industry/tbIndustry/exportXls',
-  loadTreeData = '/industry/tbIndustry/loadTreeRoot',
-  getChildList = '/industry/tbIndustry/childList',
-  getChildListBatch = '/industry/tbIndustry/getChildListBatch',
-}
-/**
- * 导出api
- * @param params
- */
-export const getExportUrl = Api.exportXls;
-/**
- * 导入api
- * @param params
- */
-export const getImportUrl = Api.importExcel;
-/**
- * 列表接口
- * @param params
- */
-export const list = (params) =>
-  defHttp.get({url: Api.list, params});
-/**
- * 删除
- */
-export const deleteTbIndustry = (params,handleSuccess) => {
-  return defHttp.delete({url: Api.deleteTbIndustry, params}, {joinParamsToUrl: true}).then(() => {
-    handleSuccess();
-  });
-}
-/**
- * 批量删除
- * @param params
- */
-export const batchDeleteTbIndustry = (params, handleSuccess) => {
-  Modal.confirm({
-    title: '确认删除',
-    content: '是否删除选中数据',
-    okText: '确认',
-    cancelText: '取消',
-    onOk: () => {
-      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
-        handleSuccess();
-      });
-    }
-  });
-}
-/**
- * 保存或者更新
- * @param params
- */
-export const saveOrUpdateDict = (params, isUpdate) => {
-  let url = isUpdate ? Api.edit : Api.save;
-  return defHttp.post({url: url, params});
-}
-/**
- * 查询全部树形节点数据
- * @param params
- */
-export const loadTreeData = (params) =>
-  defHttp.get({url: Api.loadTreeData,params});
-/**
- * 查询子节点数据
- * @param params
- */
-export const getChildList = (params) =>
-  defHttp.get({url: Api.getChildList, params});
-/**
- * 批量查询子节点数据
- * @param params
- */
-export const getChildListBatch = (params) =>
-  defHttp.get({url: Api.getChildListBatch, params},{isTransformResponse:false});
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/industry/vue3/TbIndustry.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/industry/vue3/TbIndustry.data.ts
deleted file mode 100644
index adcc007..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/industry/vue3/TbIndustry.data.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import {BasicColumn} from '/@/components/Table';
-import {FormSchema} from '/@/components/Table';
-import { rules} from '/@/utils/helper/validator';
-import { render } from '/@/utils/common/renderUtils';
-//列表数据
-export const columns: BasicColumn[] = [
-    {
-    title: '行业名称',
-    align:"center",
-    dataIndex: 'name'
-   },
-   {
-    title: '菜单类型(0:一级行业菜单; 1:工种菜单)',
-    align:"center",
-    dataIndex: 'menuType_dictText'
-   },
-   {
-    title: '排序',
-    align:"center",
-    dataIndex: 'sortNo'
-   },
-   {
-    title: '图标',
-    align:"center",
-    dataIndex: 'icon',
-    customRender:render.renderAvatar,
-   },
-];
-//查询数据
-export const searchFormSchema: FormSchema[] = [
-];
-//表单数据
-export const formSchema: FormSchema[] = [
-  {
-    label: '行业名称',
-    field: 'name',
-    component: 'Input',
-  },
-  {
-    label: '菜单类型(0:一级行业菜单; 1:工种菜单)',
-    field: 'menuType',
-    component: 'JDictSelectTag',
-    componentProps:{
-        dictCode:"emp_menu_type"
-     },
-  },
-  {
-    label: '排序',
-    field: 'sortNo',
-    component: 'InputNumber',
-  },
-  {
-    label: '图标',
-    field: 'icon',
-     component: 'JImageUpload',
-     componentProps:{
-      },
-  },
-  {
-    label: '父级节点',
-    field: 'pid',
-    component: 'Input',
-  },
-];
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/industry/vue3/TbIndustryList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/industry/vue3/TbIndustryList.vue
deleted file mode 100644
index 2bed60d..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/industry/vue3/TbIndustryList.vue
+++ /dev/null
@@ -1,272 +0,0 @@
-<template>
-  <div class="p-4">
-    <!--引用表格-->
-    <BasicTable @register="registerTable" :rowSelection="rowSelection" :expandedRowKeys="expandedRowKeys" @expand="handleExpand" @fetch-success="onFetchSuccess">
-      <!--插槽:table标题-->
-      <template #tableTitle>
-          <a-button type="primary" @click="handleCreate" preIcon="ant-design:plus-outlined"> 新增</a-button>
-          <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
-
-          <a-dropdown v-if="selectedRowKeys.length > 0">
-          <template #overlay>
-            <a-menu>
-              <a-menu-item key="1" @click="batchHandleDelete">
-                <Icon icon="ant-design:delete-outlined"></Icon>
-                删除
-              </a-menu-item>
-            </a-menu>
-          </template>
-          <a-button>批量操作
-            <Icon icon="ant-design:down-outlined"></Icon>
-          </a-button>
-        </a-dropdown>
-      </template>
-      <!--操作栏-->
-      <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)"/>
-      </template>
-    </BasicTable>
-    <!--字典弹窗-->
-    <TbIndustryModal @register="registerModal" @success="handleSuccess"/>
-  </div>
-</template>
-
-<script lang="ts" name="industry-tbIndustry" setup>
-  //ts语法
-  import {ref, computed, unref, toRaw, nextTick} from 'vue';
-  import {BasicTable, useTable, TableAction} from '/src/components/Table';
-  import {useModal} from '/src/components/Modal';
-  import { useListPage } from '/@/hooks/system/useListPage'
-  import TbIndustryModal from './components/TbIndustryModal.vue';
-  import {columns} from './TbIndustry.data';
-  import {list, deleteTbIndustry, batchDeleteTbIndustry, getExportUrl,getImportUrl, getChildList,getChildListBatch} from './TbIndustry.api';
-
-  const expandedRowKeys = ref([]);
-  //字典model
-  const [registerModal, {openModal}] = useModal();
-   //注册table数据
-  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
-    tableProps:{
-         title: 'tb_industry',
-         columns,
-         canResize:false,
-         actionColumn: {
-             width: 120,
-          },
-    },
-     exportConfig: {
-          name:"tb_industry",
-          url: getExportUrl,
-        },
-        importConfig: {
-          url: getImportUrl,
-          success: importSuccess
-        },
-    })
-
-  const [registerTable, {reload, collapseAll, updateTableDataRecord, findTableDataRecord,getDataSource},{ rowSelection, selectedRowKeys }] = tableContext
-
-  /**
-   * 新增事件
-   */
-  function handleCreate() {
-    openModal(true, {
-      isUpdate: false,
-    });
-  }
-
-  /**
-   * 编辑事件
-   */
-  async function handleEdit(record) {
-    openModal(true, {
-      record,
-      isUpdate: true,
-    });
-  }
-
-  /**
-   * 详情
-   */
-  async function handleDetail(record) {
-    openModal(true, {
-      record,
-      isUpdate: true,
-      hideFooter: true,
-    });
-  }
-
-  /**
-   * 删除事件
-   */
-  async function handleDelete(record) {
-    await deleteTbIndustry({id: record.id}, importSuccess);
-  }
-
-  /**
-   * 批量删除事件
-   */
-  async function batchHandleDelete() {
-    const ids = selectedRowKeys.value.filter(item => !item.includes('loading'))
-    await batchDeleteTbIndustry({ids: ids}, importSuccess);
-  }
-  /**
-   * 导入
-   */
-   function importSuccess() {
-    reload() && (expandedRowKeys.value = []);
-  }
-  /**
-   * 添加下级
-   */
-  function handleAddSub(record) {
-    openModal(true, {
-      record,
-      isUpdate: false,
-    });
-  }
-  /**
-   * 成功回调
-   */
-  async function handleSuccess({isUpdate, values, expandedArr}) {
-    if (isUpdate) {
-      //编辑回调
-      updateTableDataRecord(values.id, values);
-    } else {
-        if(!values['pid']){
-            //新增根节点
-            reload();
-        }else{
-            //新增子集
-            expandedRowKeys.value = [];
-            for (let key of unref(expandedArr)) {
-                await expandTreeNode(key)
-            }
-        }
-    }
-  }
-
-  /**
-   * 接口请求成功后回调
-   */
-  function onFetchSuccess(result) {
-      getDataByResult(result.items)&&loadDataByExpandedRows();
-  }
-  /**
-   * 根据已展开的行查询数据（用于保存后刷新时异步加载子级的数据）
-   */
-  async function loadDataByExpandedRows() {
-      if (unref(expandedRowKeys).length > 0) {
-          const res = await getChildListBatch({ parentIds: unref(expandedRowKeys).join(',')});
-          if (res.success && res.result.records.length>0) {
-              //已展开的数据批量子节点
-              let records = res.result.records
-              const listMap = new Map();
-              for (let item of records) {
-                  let pid = item['pid'];
-                  if (unref(expandedRowKeys).includes(pid)) {
-                      let mapList = listMap.get(pid);
-                      if (mapList == null) {
-                          mapList = [];
-                      }
-                      mapList.push(item);
-                      listMap.set(pid, mapList);
-                  }
-              }
-              let childrenMap = listMap;
-              let fn = (list) => {
-                  if(list) {
-                      list.forEach(data => {
-                          if (unref(expandedRowKeys).includes(data.id)) {
-                              data.children = getDataByResult(childrenMap.get(data.id))
-                              fn(data.children)
-                          }
-                      })
-                  }
-              };
-              fn(getDataSource())
-          }
-      }
-  }
-  /**
-   * 处理数据集
-   */
-  function getDataByResult(result){
-      if(result && result.length>0){
-          return result.map(item=>{
-              //判断是否标记了带有子节点
-              if(item["hasChild"]=='1'){
-                  let loadChild = { id: item.id+'_loadChild', name: 'loading...', isLoading: true }
-                  item.children = [loadChild]
-              }
-              return item
-          })
-      }
-  }
-  /**
-   *树节点展开合并
-   * */
-  async function handleExpand(expanded, record) {
-    // 判断是否是展开状态，展开状态(expanded)并且存在子集(children)并且未加载过(isLoading)的就去查询子节点数据
-    if (expanded) {
-       expandedRowKeys.value.push(record.id)
-      if (record.children.length > 0 && !!record.children[0].isLoading) {
-        let result = await getChildList({pid: record.id});
-        result=result.records?result.records:result;
-        if (result && result.length > 0) {
-          record.children = getDataByResult(result);
-        } else {
-          record.children = null
-          record.hasChild = '0'
-        }
-      }
-    } else {
-      let keyIndex = expandedRowKeys.value.indexOf(record.id)
-      if (keyIndex >= 0) {
-        expandedRowKeys.value.splice(keyIndex, 1);
-      }
-    }
-  }
-  /**
-   *操作表格后处理树节点展开合并
-   * */
-  async function expandTreeNode(key) {
-    let record = findTableDataRecord(key)
-    expandedRowKeys.value.push(key);
-      let result = await getChildList({pid: key});
-      if (result && result.length > 0) {
-          record.children = getDataByResult(result);
-      } else {
-          record.children = null
-          record.hasChild = '0'
-      }
-      updateTableDataRecord(key, record);
-  }
-  /**
-   * 操作栏
-   */
-  function getTableAction(record) {
-    return [
-      {
-        label: '编辑',
-        onClick: handleEdit.bind(null, record),
-      },
-      {
-        label: '删除',
-        popConfirm: {
-          title: '确定删除吗?',
-          confirm: handleDelete.bind(null, record),
-        },
-      },
-      {
-        label: '添加下级',
-        onClick: handleAddSub.bind(null, {pid: record.id}),
-      }
-    ]
-  }
-</script>
-
-<style scoped>
-
-</style>
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/industry/vue3/components/TbIndustryModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/industry/vue3/components/TbIndustryModal.vue
deleted file mode 100644
index ef9c2e6..0000000
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/industry/vue3/components/TbIndustryModal.vue
+++ /dev/null
@@ -1,87 +0,0 @@
-<template>
-  <BasicModal v-bind="$attrs" @register="registerModal" :title="getTitle" @ok="handleSubmit">
-    <BasicForm @register="registerForm"/>
-  </BasicModal>
-</template>
-<script lang="ts" setup>
-  import {ref, computed, unref} from 'vue';
-  import {BasicModal, useModalInner} from '/src/components/Modal';
-  import {BasicForm, useForm} from '/src/components/Form';
-  import {formSchema} from '../tbIndustry.data';
-  import {loadTreeData, saveOrUpdateDict} from '../tbIndustry.api';
-  // 获取emit
-  const emit = defineEmits(['register', 'success']);
-  const isUpdate = ref(true);
-  const expandedRowKeys = ref([]);
-  const treeData = ref([]);
-  //表单配置
-  const [registerForm, {resetFields, setFieldsValue, validate, updateSchema}] = useForm({
-    schemas: formSchema,
-    showActionButtonGroup: false,
-    labelCol: {
-      xs: { span: 24 },
-      sm: { span: 4 },
-    },
-    wrapperCol: {
-      xs: { span: 24 },
-      sm: { span: 18 },
-    },
-  });
-  //表单赋值
-  const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
-    //重置表单
-    await resetFields();
-    expandedRowKeys.value = [];
-    setModalProps({confirmLoading: false, minHeight: 80});
-    isUpdate.value = !!data?.isUpdate;
-    if (data?.record) {
-      //表单赋值
-      await setFieldsValue({
-        ...data.record,
-      });
-    }
-    //父级节点树信息
-    treeData.value = await loadTreeData({'async': false,'pcode':''});
-    updateSchema({
-      field: 'pid',
-      componentProps: {treeData},
-    });
-  });
-  //设置标题
-  const getTitle = computed(() => (!unref(isUpdate) ? '新增字典' : '编辑字典'));
-
-  /**
-   * 根据pid获取展开的节点
-   * @param pid
-   * @param arr
-   */
-  function getExpandKeysByPid(pid,arr){
-    if(pid && arr && arr.length>0){
-      for(let i=0;i<arr.length;i++){
-        if(arr[i].key==pid && unref(expandedRowKeys).indexOf(pid)<0){
-          expandedRowKeys.value.push(arr[i].key);
-          getExpandKeysByPid(arr[i]['parentId'],unref(treeData))
-        }else{
-          getExpandKeysByPid(pid,arr[i].children)
-        }
-      }
-    }
-  }
-  //表单提交事件
-  async function handleSubmit() {
-    try {
-      let values = await validate();
-      setModalProps({confirmLoading: true});
-      //提交表单
-      await saveOrUpdateDict(values, isUpdate.value);
-      //关闭弹窗
-      closeModal();
-      //展开的节点信息
-      await getExpandKeysByPid(values['pid'],unref(treeData))
-      //刷新列表(isUpdate:是否编辑;values:表单信息;expandedArr:展开的节点信息)
-      emit('success', {isUpdate: unref(isUpdate), values:{...values},expandedArr: unref(expandedRowKeys).reverse()});
-    } finally {
-      setModalProps({confirmLoading: false});
-    }
-  }
-</script>
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/controller/TbUserRoleController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/controller/TbUserRoleController.java
index d626c42..ca1e806 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/controller/TbUserRoleController.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/controller/TbUserRoleController.java
@@ -22,11 +22,12 @@ import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
 
  /**
- * @Description: 角色表
+ * @Description: tb_user_role
  * @Author: jeecg-boot
- * @Date:   2024-10-16
+ * @Date:   2024-12-07
  * @Version: V1.0
  */
+@Api(tags="tb_user_role")
 @RestController
 @RequestMapping("/userRole/tbUserRole")
 @Slf4j
@@ -43,18 +44,35 @@ public class TbUserRoleController extends JeecgController<TbUserRole, ITbUserRol
 	 * @param req
 	 * @return
 	 */
-	//@AutoLog(value = "角色表-分页列表查询")
-	@ApiOperation(value="角色表-分页列表查询", notes="角色表-分页列表查询")
+	//@AutoLog(value = "tb_user_role-分页列表查询")
+	@ApiOperation(value="tb_user_role-分页列表查询", notes="tb_user_role-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<IPage<TbUserRole>> queryPageList(TbUserRole tbUserRole,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
 		QueryWrapper<TbUserRole> queryWrapper = QueryGenerator.initQueryWrapper(tbUserRole, req.getParameterMap());
+		queryWrapper.in("role",0,1).orderByDesc("create_time");
 		Page<TbUserRole> page = new Page<TbUserRole>(pageNo, pageSize);
 		IPage<TbUserRole> pageList = tbUserRoleService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
+
+
+	 @ApiOperation(value="tb_user_role-分页列表查询", notes="tb_user_role-分页列表查询")
+	 @GetMapping(value = "/list1")
+	 public Result<IPage<TbUserRole>> queryPageList1(TbUserRole tbUserRole,
+													@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+													@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+													HttpServletRequest req) {
+		 QueryWrapper<TbUserRole> queryWrapper = QueryGenerator.initQueryWrapper(tbUserRole, req.getParameterMap());
+		 queryWrapper.eq("role",2).orderByDesc("create_time");
+		 Page<TbUserRole> page = new Page<TbUserRole>(pageNo, pageSize);
+		 IPage<TbUserRole> pageList = tbUserRoleService.page(page, queryWrapper);
+		 return Result.OK(pageList);
+	 }
+
+
 	
 	/**
 	 *   添加
@@ -62,8 +80,8 @@ public class TbUserRoleController extends JeecgController<TbUserRole, ITbUserRol
 	 * @param tbUserRole
 	 * @return
 	 */
-	@AutoLog(value = "角色表-添加")
-	@ApiOperation(value="角色表-添加", notes="角色表-添加")
+	@AutoLog(value = "tb_user_role-添加")
+	@ApiOperation(value="tb_user_role-添加", notes="tb_user_role-添加")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody TbUserRole tbUserRole) {
 		tbUserRoleService.save(tbUserRole);
@@ -76,8 +94,8 @@ public class TbUserRoleController extends JeecgController<TbUserRole, ITbUserRol
 	 * @param tbUserRole
 	 * @return
 	 */
-	@AutoLog(value = "角色表-编辑")
-	@ApiOperation(value="角色表-编辑", notes="角色表-编辑")
+	@AutoLog(value = "tb_user_role-编辑")
+	@ApiOperation(value="tb_user_role-编辑", notes="tb_user_role-编辑")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody TbUserRole tbUserRole) {
 		tbUserRoleService.updateById(tbUserRole);
@@ -90,8 +108,8 @@ public class TbUserRoleController extends JeecgController<TbUserRole, ITbUserRol
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "角色表-通过id删除")
-	@ApiOperation(value="角色表-通过id删除", notes="角色表-通过id删除")
+	@AutoLog(value = "tb_user_role-通过id删除")
+	@ApiOperation(value="tb_user_role-通过id删除", notes="tb_user_role-通过id删除")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
 		tbUserRoleService.removeById(id);
@@ -104,8 +122,8 @@ public class TbUserRoleController extends JeecgController<TbUserRole, ITbUserRol
 	 * @param ids
 	 * @return
 	 */
-	@AutoLog(value = "角色表-批量删除")
-	@ApiOperation(value="角色表-批量删除", notes="角色表-批量删除")
+	@AutoLog(value = "tb_user_role-批量删除")
+	@ApiOperation(value="tb_user_role-批量删除", notes="tb_user_role-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.tbUserRoleService.removeByIds(Arrays.asList(ids.split(",")));
@@ -118,8 +136,8 @@ public class TbUserRoleController extends JeecgController<TbUserRole, ITbUserRol
 	 * @param id
 	 * @return
 	 */
-	//@AutoLog(value = "角色表-通过id查询")
-	@ApiOperation(value="角色表-通过id查询", notes="角色表-通过id查询")
+	//@AutoLog(value = "tb_user_role-通过id查询")
+	@ApiOperation(value="tb_user_role-通过id查询", notes="tb_user_role-通过id查询")
 	@GetMapping(value = "/queryById")
 	public Result<TbUserRole> queryById(@RequestParam(name="id",required=true) String id) {
 		TbUserRole tbUserRole = tbUserRoleService.getById(id);
@@ -137,7 +155,7 @@ public class TbUserRoleController extends JeecgController<TbUserRole, ITbUserRol
     */
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, TbUserRole tbUserRole) {
-        return super.exportXls(request, tbUserRole, TbUserRole.class, "角色表");
+        return super.exportXls(request, tbUserRole, TbUserRole.class, "tb_user_role");
     }
 
     /**
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/entity/TbUserRole.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/entity/TbUserRole.java
index 8e7fd9a..65cb668 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/entity/TbUserRole.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/entity/TbUserRole.java
@@ -18,94 +18,111 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
- * @Description: 角色表
+ * @Description: tb_user_role
  * @Author: jeecg-boot
- * @Date:   2024-10-16
+ * @Date:   2024-12-07
  * @Version: V1.0
  */
 @Data
 @TableName("tb_user_role")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="tb_user_role对象", description="角色表")
+@ApiModel(value="tb_user_role对象", description="tb_user_role")
 public class TbUserRole implements Serializable {
     private static final long serialVersionUID = 1L;
 
-	/**主键*/
+	/**id*/
 	@TableId(type = IdType.ASSIGN_ID)
-    @ApiModelProperty(value = "主键")
-    private String id;
+    @ApiModelProperty(value = "id")
+    private java.lang.String id;
 	/**用户id*/
 	@Excel(name = "用户id", width = 15)
     @ApiModelProperty(value = "用户id")
-    private String userId;
-	/**角色信息 用人方企业 1  用人方个人 0*/
-	@Excel(name = "角色信息 用人方企业 1  用人方个人 0", width = 15, dicCode = "user_role")
-	@Dict(dicCode = "user_role")
-    @ApiModelProperty(value = "用人方企业 1  用人方个人 0")
-    private Integer role;
+    private java.lang.String userId;
 	/**用户名*/
 	@Excel(name = "用户名", width = 15)
     @ApiModelProperty(value = "用户名")
-    private String userName;
-    /**行业*/
-    @Excel(name = "行业", width = 15)
-    @ApiModelProperty(value = "行业")
-    private String industry;
-    /**公司名称*/
-    @Excel(name = "公司名称", width = 15)
+    private java.lang.String userName;
+	/**公司名称*/
+	@Excel(name = "公司名称", width = 15)
     @ApiModelProperty(value = "公司名称")
-    private String companyName;
-	/**税收编码*/
-	@Excel(name = "税收编码", width = 15)
-    @ApiModelProperty(value = "税收编码")
-    private String taxCode;
-	/**公司地址*/
-	@Excel(name = "公司地址", width = 15)
-    @ApiModelProperty(value = "公司地址")
-    private String address;
-	/**公司账号*/
-	@Excel(name = "公司账号", width = 15)
-    @ApiModelProperty(value = "公司账号")
-    private String bankAccount;
+    private java.lang.String companyName;
+	/**地址*/
+	@Excel(name = "地址", width = 15)
+    @ApiModelProperty(value = "地址")
+    private java.lang.String companyAddress;
+	/**地址*/
+	@Excel(name = "地址", width = 15)
+    @ApiModelProperty(value = "地址")
+    private java.lang.String address;
+	/**行业/工种*/
+	@Excel(name = "行业/工种", width = 15)
+    @ApiModelProperty(value = "行业/工种")
+    private java.lang.String industryName;
+	/**行业/工种id*/
+	@Excel(name = "行业/工种id", width = 15)
+    @ApiModelProperty(value = "行业/工种id")
+    private java.lang.String industryId;
+	/**个人简介*/
+	@Excel(name = "个人简介", width = 15)
+    @ApiModelProperty(value = "个人简介")
+    private java.lang.String detail;
+	/**身份证上传*/
+	@Excel(name = "身份证上传", width = 15)
+    @ApiModelProperty(value = "身份证上传")
+    private java.lang.String idCard;
 	/**电话*/
 	@Excel(name = "电话", width = 15)
     @ApiModelProperty(value = "电话")
-    private String phone;
-	/**开户行*/
-	@Excel(name = "开户行", width = 15)
-    @ApiModelProperty(value = "开户行")
-    private String bankNama;
+    private java.lang.String phone;
+	/**年龄*/
+	@Excel(name = "年龄", width = 15)
+    @ApiModelProperty(value = "年龄")
+    private java.lang.Integer age;
+	/**性别*/
+	@Excel(name = "性别", width = 15, dicCode = "sex")
+	@Dict(dicCode = "sex")
+    @ApiModelProperty(value = "性别")
+    private java.lang.Integer gender;
+	/**期望薪资最小值*/
+	@Excel(name = "期望薪资最小值", width = 15)
+    @ApiModelProperty(value = "期望薪资最小值")
+    private java.lang.Integer moneyMin;
+	/**期望薪资最大值*/
+	@Excel(name = "期望薪资最大值", width = 15)
+    @ApiModelProperty(value = "期望薪资最大值")
+    private java.lang.Integer moneyMax;
+	/**角色*/
+	@Excel(name = "角色", width = 15, dicCode = "user_role")
+	@Dict(dicCode = "user_role")
+    @ApiModelProperty(value = "角色  用人方企业 1  用人方个人 0  2 求职方")
+    private java.lang.Integer role;
 	/**营业执照上传*/
 	@Excel(name = "营业执照上传", width = 15)
     @ApiModelProperty(value = "营业执照上传")
-    private String businessLicense;
-	/**基本户信息照片上传*/
-	@Excel(name = "基本户信息照片上传", width = 15)
-    @ApiModelProperty(value = "基本户信息照片上传")
-    private String basicAccount;
-	/**收款银行照片上传*/
-	@Excel(name = "收款银行照片上传", width = 15)
-    @ApiModelProperty(value = "收款银行照片上传")
-    private String bankInfo;
+    private java.lang.String businessLicense;
 	/**审核状态 0审核中 1 审核通过 2审核未通过*/
 	@Excel(name = "审核状态 0审核中 1 审核通过 2审核未通过", width = 15, dicCode = "audit_status")
 	@Dict(dicCode = "audit_status")
     @ApiModelProperty(value = "审核状态 0审核中 1 审核通过 2审核未通过")
-    private Integer auditStatus;
+    private java.lang.Integer auditStatus;
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
-    private String createBy;
+    private java.lang.String createBy;
 	/**创建日期*/
     @ApiModelProperty(value = "创建日期")
-    private Date createTime;
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private java.util.Date createTime;
 	/**更新人*/
     @ApiModelProperty(value = "更新人")
-    private String updateBy;
+    private java.lang.String updateBy;
 	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "更新日期")
-    private Date updateTime;
+    private java.util.Date updateTime;
 	/**所属部门*/
     @ApiModelProperty(value = "所属部门")
-    private String sysOrgCode;
+    private java.lang.String sysOrgCode;
 }
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/mapper/TbUserRoleMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/mapper/TbUserRoleMapper.java
index 860e826..eddcddf 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/mapper/TbUserRoleMapper.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/mapper/TbUserRoleMapper.java
@@ -4,9 +4,9 @@ import org.jeecg.modules.userRole.entity.TbUserRole;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
- * @Description: 角色表
+ * @Description: tb_user_role
  * @Author: jeecg-boot
- * @Date:   2024-10-16
+ * @Date:   2024-12-07
  * @Version: V1.0
  */
 public interface TbUserRoleMapper extends BaseMapper<TbUserRole> {
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/service/ITbUserRoleService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/service/ITbUserRoleService.java
index 58f7f24..0e2f290 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/service/ITbUserRoleService.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/service/ITbUserRoleService.java
@@ -6,14 +6,12 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import java.util.Map;
 
 /**
- * @Description: 角色表
+ * @Description: tb_user_role
  * @Author: jeecg-boot
- * @Date:   2024-10-16
+ * @Date:   2024-12-07
  * @Version: V1.0
  */
 public interface ITbUserRoleService extends IService<TbUserRole> {
-
     //获取首页基础信息
     Map getRoleInfo(String userId);
-
 }
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/service/impl/TbUserRoleServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/service/impl/TbUserRoleServiceImpl.java
index 21a08cc..4340b2f 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/service/impl/TbUserRoleServiceImpl.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/service/impl/TbUserRoleServiceImpl.java
@@ -12,15 +12,14 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * @Description: 角色表
+ * @Description: tb_user_role
  * @Author: jeecg-boot
- * @Date: 2024-10-16
+ * @Date:   2024-12-07
  * @Version: V1.0
  */
 @Service
 public class TbUserRoleServiceImpl extends ServiceImpl<TbUserRoleMapper, TbUserRole> implements ITbUserRoleService {
 
-
     @Override
     public Map getRoleInfo(String userId) {
 
@@ -41,5 +40,4 @@ public class TbUserRoleServiceImpl extends ServiceImpl<TbUserRoleMapper, TbUserR
 
     }
 
-
 }
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/vue/TbUserRoleList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/vue/TbUserRoleList.vue
index c602242..cbd9f83 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/vue/TbUserRoleList.vue
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/vue/TbUserRoleList.vue
@@ -5,32 +5,15 @@
       <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="角色信息 1供应商 2采购商">
-              <j-dict-select-tag placeholder="请选择角色信息 1供应商 2采购商" v-model="queryParam.role" dictCode="user_role"/>
+            <a-form-item label="电话">
+              <a-input placeholder="请输入电话" v-model="queryParam.phone"></a-input>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="用户名">
-              <a-input placeholder="请输入用户名" v-model="queryParam.userName"></a-input>
+            <a-form-item label="审核状态 0审核中 1 审核通过 2审核未通过">
+              <j-dict-select-tag placeholder="请选择审核状态 0审核中 1 审核通过 2审核未通过" v-model="queryParam.auditStatus" dictCode="audit_status"/>
             </a-form-item>
           </a-col>
-          <template v-if="toggleSearchStatus">
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="公司名称">
-                <a-input placeholder="请输入公司名称" v-model="queryParam.companyName"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="电话">
-                <a-input placeholder="请输入电话" v-model="queryParam.phone"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="审核状态 0审核中 1 审核通过 2审核未通过">
-                <j-dict-select-tag placeholder="请选择审核状态 0审核中 1 审核通过 2审核未通过" v-model="queryParam.auditStatus" dictCode="audit_status"/>
-              </a-form-item>
-            </a-col>
-          </template>
           <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>
@@ -49,7 +32,7 @@
     <!-- 操作按钮区域 -->
     <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-button type="primary" icon="download" @click="handleExportXls('tb_user_role')">导出</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>
@@ -146,7 +129,7 @@
     },
     data () {
       return {
-        description: '角色表管理页面',
+        description: 'tb_user_role管理页面',
         // 表头
         columns: [
           {
@@ -159,11 +142,6 @@
               return parseInt(index)+1;
             }
           },
-          {
-            title:'角色信息 1供应商 2采购商',
-            align:"center",
-            dataIndex: 'role_dictText'
-          },
           {
             title:'用户名',
             align:"center",
@@ -175,19 +153,30 @@
             dataIndex: 'companyName'
           },
           {
-            title:'税收编码',
+            title:'地址',
             align:"center",
-            dataIndex: 'taxCode'
+            dataIndex: 'companyAddress'
           },
           {
-            title:'公司地址',
+            title:'地址',
             align:"center",
             dataIndex: 'address'
           },
           {
-            title:'公司账号',
+            title:'行业/工种',
+            align:"center",
+            dataIndex: 'industryName'
+          },
+          {
+            title:'个人简介',
+            align:"center",
+            dataIndex: 'detail'
+          },
+          {
+            title:'身份证上传',
             align:"center",
-            dataIndex: 'bankAccount'
+            dataIndex: 'idcard',
+            scopedSlots: {customRender: 'imgSlot'}
           },
           {
             title:'电话',
@@ -195,26 +184,34 @@
             dataIndex: 'phone'
           },
           {
-            title:'开户行',
+            title:'年龄',
             align:"center",
-            dataIndex: 'bankNama'
+            dataIndex: 'age'
           },
           {
-            title:'营业执照上传',
+            title:'性别',
             align:"center",
-            dataIndex: 'businessLicense',
-            scopedSlots: {customRender: 'imgSlot'}
+            dataIndex: 'gender_dictText'
           },
           {
-            title:'基本户信息照片上传',
+            title:'期望薪资最小值',
             align:"center",
-            dataIndex: 'basicAccount',
-            scopedSlots: {customRender: 'imgSlot'}
+            dataIndex: 'moneymin'
+          },
+          {
+            title:'期望薪资最大值',
+            align:"center",
+            dataIndex: 'moneymax'
           },
           {
-            title:'收款银行照片上传',
+            title:'角色',
             align:"center",
-            dataIndex: 'bankInfo',
+            dataIndex: 'role_dictText'
+          },
+          {
+            title:'营业执照上传',
+            align:"center",
+            dataIndex: 'businessLicense',
             scopedSlots: {customRender: 'imgSlot'}
           },
           {
@@ -256,17 +253,20 @@
       },
       getSuperFieldList(){
         let fieldList=[];
-        fieldList.push({type:'int',value:'role',text:'角色信息 1供应商 2采购商',dictCode:'user_role'})
         fieldList.push({type:'string',value:'userName',text:'用户名',dictCode:''})
         fieldList.push({type:'string',value:'companyName',text:'公司名称',dictCode:''})
-        fieldList.push({type:'string',value:'taxCode',text:'税收编码',dictCode:''})
-        fieldList.push({type:'string',value:'address',text:'公司地址',dictCode:''})
-        fieldList.push({type:'string',value:'bankAccount',text:'公司账号',dictCode:''})
+        fieldList.push({type:'string',value:'companyAddress',text:'地址',dictCode:''})
+        fieldList.push({type:'string',value:'address',text:'地址',dictCode:''})
+        fieldList.push({type:'string',value:'industryName',text:'行业/工种',dictCode:''})
+        fieldList.push({type:'Text',value:'detail',text:'个人简介',dictCode:''})
+        fieldList.push({type:'Text',value:'idcard',text:'身份证上传',dictCode:''})
         fieldList.push({type:'string',value:'phone',text:'电话',dictCode:''})
-        fieldList.push({type:'string',value:'bankNama',text:'开户行',dictCode:''})
+        fieldList.push({type:'int',value:'age',text:'年龄',dictCode:''})
+        fieldList.push({type:'int',value:'gender',text:'性别',dictCode:'sex'})
+        fieldList.push({type:'int',value:'moneymin',text:'期望薪资最小值',dictCode:''})
+        fieldList.push({type:'int',value:'moneymax',text:'期望薪资最大值',dictCode:''})
+        fieldList.push({type:'int',value:'role',text:'角色',dictCode:'user_role'})
         fieldList.push({type:'Text',value:'businessLicense',text:'营业执照上传',dictCode:''})
-        fieldList.push({type:'Text',value:'basicAccount',text:'基本户信息照片上传',dictCode:''})
-        fieldList.push({type:'Text',value:'bankInfo',text:'收款银行照片上传',dictCode:''})
         fieldList.push({type:'int',value:'auditStatus',text:'审核状态 0审核中 1 审核通过 2审核未通过',dictCode:'audit_status'})
         this.superFieldList = fieldList
       }
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/vue/modules/TbUserRoleForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/vue/modules/TbUserRoleForm.vue
index 343863d..744a77c 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/vue/modules/TbUserRoleForm.vue
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/vue/modules/TbUserRoleForm.vue
@@ -3,11 +3,6 @@
     <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="角色信息 1供应商 2采购商" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="role">
-              <j-dict-select-tag type="list" v-model="model.role" dictCode="user_role" placeholder="请选择角色信息 1供应商 2采购商" />
-            </a-form-model-item>
-          </a-col>
           <a-col :span="24">
             <a-form-model-item label="用户名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userName">
               <a-input v-model="model.userName" placeholder="请输入用户名"  ></a-input>
@@ -19,18 +14,28 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="税收编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="taxCode">
-              <a-input v-model="model.taxCode" placeholder="请输入税收编码"  ></a-input>
+            <a-form-model-item label="地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="companyAddress">
+              <a-input v-model="model.companyAddress" placeholder="请输入地址"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="address">
+              <a-input v-model="model.address" placeholder="请输入地址"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="公司地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="address">
-              <a-input v-model="model.address" placeholder="请输入公司地址"  ></a-input>
+            <a-form-model-item label="行业/工种" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="industryName">
+              <a-input v-model="model.industryName" placeholder="请输入行业/工种"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="公司账号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bankAccount">
-              <a-input v-model="model.bankAccount" placeholder="请输入公司账号"  ></a-input>
+            <a-form-model-item label="个人简介" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="detail">
+              <a-textarea v-model="model.detail" rows="4" placeholder="请输入个人简介" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="身份证上传" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="idcard">
+              <j-image-upload isMultiple  v-model="model.idcard" ></j-image-upload>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -39,23 +44,33 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="开户行" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bankNama">
-              <a-input v-model="model.bankNama" placeholder="请输入开户行"  ></a-input>
+            <a-form-model-item label="年龄" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="age">
+              <a-input-number v-model="model.age" placeholder="请输入年龄" style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="营业执照上传" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="businessLicense">
-              <j-image-upload isMultiple  v-model="model.businessLicense" ></j-image-upload>
+            <a-form-model-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="gender">
+              <j-dict-select-tag type="list" v-model="model.gender" dictCode="sex" placeholder="请选择性别" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="基本户信息照片上传" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="basicAccount">
-              <j-image-upload isMultiple  v-model="model.basicAccount" ></j-image-upload>
+            <a-form-model-item label="期望薪资最小值" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="moneymin">
+              <a-input-number v-model="model.moneymin" placeholder="请输入期望薪资最小值" style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="收款银行照片上传" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bankInfo">
-              <j-image-upload isMultiple  v-model="model.bankInfo" ></j-image-upload>
+            <a-form-model-item label="期望薪资最大值" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="moneymax">
+              <a-input-number v-model="model.moneymax" placeholder="请输入期望薪资最大值" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="角色" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="role">
+              <j-dict-select-tag type="list" v-model="model.role" dictCode="user_role" placeholder="请选择角色" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="营业执照上传" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="businessLicense">
+              <j-image-upload isMultiple  v-model="model.businessLicense" ></j-image-upload>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/vue3/TbUserRole.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/vue3/TbUserRole.data.ts
index 540f7b4..35ac94b 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/vue3/TbUserRole.data.ts
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/vue3/TbUserRole.data.ts
@@ -5,11 +5,6 @@ import { render } from '/@/utils/common/renderUtils';
 //列表数据
 export const columns: BasicColumn[] = [
     {
-    title: '角色信息 1供应商 2采购商',
-    align:"center",
-    dataIndex: 'role_dictText'
-   },
-   {
     title: '用户名',
     align:"center",
     dataIndex: 'userName'
@@ -20,19 +15,30 @@ export const columns: BasicColumn[] = [
     dataIndex: 'companyName'
    },
    {
-    title: '税收编码',
+    title: '地址',
     align:"center",
-    dataIndex: 'taxCode'
+    dataIndex: 'companyAddress'
    },
    {
-    title: '公司地址',
+    title: '地址',
     align:"center",
     dataIndex: 'address'
    },
    {
-    title: '公司账号',
+    title: '行业/工种',
+    align:"center",
+    dataIndex: 'industryName'
+   },
+   {
+    title: '个人简介',
     align:"center",
-    dataIndex: 'bankAccount'
+    dataIndex: 'detail'
+   },
+   {
+    title: '身份证上传',
+    align:"center",
+    dataIndex: 'idcard',
+    customRender:render.renderAvatar,
    },
    {
     title: '电话',
@@ -40,26 +46,34 @@ export const columns: BasicColumn[] = [
     dataIndex: 'phone'
    },
    {
-    title: '开户行',
+    title: '年龄',
     align:"center",
-    dataIndex: 'bankNama'
+    dataIndex: 'age'
    },
    {
-    title: '营业执照上传',
+    title: '性别',
     align:"center",
-    dataIndex: 'businessLicense',
-    customRender:render.renderAvatar,
+    dataIndex: 'gender_dictText'
    },
    {
-    title: '基本户信息照片上传',
+    title: '期望薪资最小值',
     align:"center",
-    dataIndex: 'basicAccount',
-    customRender:render.renderAvatar,
+    dataIndex: 'moneymin'
+   },
+   {
+    title: '期望薪资最大值',
+    align:"center",
+    dataIndex: 'moneymax'
+   },
+   {
+    title: '角色',
+    align:"center",
+    dataIndex: 'role_dictText'
    },
    {
-    title: '收款银行照片上传',
+    title: '营业执照上传',
     align:"center",
-    dataIndex: 'bankInfo',
+    dataIndex: 'businessLicense',
     customRender:render.renderAvatar,
    },
    {
@@ -71,27 +85,6 @@ export const columns: BasicColumn[] = [
 //查询数据
 export const searchFormSchema: FormSchema[] = [
 	{
-      label: "角色信息 1供应商 2采购商",
-      field: "role",
-      component: 'JDictSelectTag',
-      componentProps:{
-          dictCode:"user_role"
-      },
-      colProps: {span: 6},
- 	},
-	{
-      label: "用户名",
-      field: "userName",
-      component: 'Input',
-      colProps: {span: 6},
- 	},
-	{
-      label: "公司名称",
-      field: "companyName",
-      component: 'Input',
-      colProps: {span: 6},
- 	},
-	{
       label: "电话",
       field: "phone",
       component: 'Input',
@@ -109,14 +102,6 @@ export const searchFormSchema: FormSchema[] = [
 ];
 //表单数据
 export const formSchema: FormSchema[] = [
-  {
-    label: '角色信息 1供应商 2采购商',
-    field: 'role',
-    component: 'JDictSelectTag',
-    componentProps:{
-        dictCode:"user_role"
-     },
-  },
   {
     label: '用户名',
     field: 'userName',
@@ -128,47 +113,71 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
   },
   {
-    label: '税收编码',
-    field: 'taxCode',
+    label: '地址',
+    field: 'companyAddress',
     component: 'Input',
   },
   {
-    label: '公司地址',
+    label: '地址',
     field: 'address',
     component: 'Input',
   },
   {
-    label: '公司账号',
-    field: 'bankAccount',
+    label: '行业/工种',
+    field: 'industryName',
     component: 'Input',
   },
+  {
+    label: '个人简介',
+    field: 'detail',
+    component: 'InputTextArea',//TODO 注意string转换问题
+  },
+  {
+    label: '身份证上传',
+    field: 'idcard',
+     component: 'JImageUpload',
+     componentProps:{
+      },
+  },
   {
     label: '电话',
     field: 'phone',
     component: 'Input',
   },
   {
-    label: '开户行',
-    field: 'bankNama',
-    component: 'Input',
+    label: '年龄',
+    field: 'age',
+    component: 'InputNumber',
   },
   {
-    label: '营业执照上传',
-    field: 'businessLicense',
-     component: 'JImageUpload',
-     componentProps:{
-      },
+    label: '性别',
+    field: 'gender',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"sex"
+     },
   },
   {
-    label: '基本户信息照片上传',
-    field: 'basicAccount',
-     component: 'JImageUpload',
-     componentProps:{
-      },
+    label: '期望薪资最小值',
+    field: 'moneymin',
+    component: 'InputNumber',
+  },
+  {
+    label: '期望薪资最大值',
+    field: 'moneymax',
+    component: 'InputNumber',
   },
   {
-    label: '收款银行照片上传',
-    field: 'bankInfo',
+    label: '角色',
+    field: 'role',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"user_role"
+     },
+  },
+  {
+    label: '营业执照上传',
+    field: 'businessLicense',
      component: 'JImageUpload',
      componentProps:{
       },
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/vue3/TbUserRoleList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/vue3/TbUserRoleList.vue
index 9c06043..ba45ca5 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/vue3/TbUserRoleList.vue
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/vue3/TbUserRoleList.vue
@@ -53,7 +53,7 @@
   //注册table数据
   const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
       tableProps:{
-           title: '角色表',
+           title: 'tb_user_role',
            api: list,
            columns,
            canResize:false,
@@ -70,7 +70,7 @@
             },
       },
        exportConfig: {
-            name:"角色表",
+            name:"tb_user_role",
             url: getExportUrl,
           },
           importConfig: {