diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppTopicController.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppTopicController.java
index a55d179..81c9dde 100644
--- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppTopicController.java
+++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppTopicController.java
@@ -25,6 +25,7 @@ import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.web.page.TableDataInfo;
+import springfox.documentation.annotations.ApiIgnore;
 
 /**
  * 话题信息Controller
@@ -46,11 +47,11 @@ public class AppTopicController extends BaseController
 //    @RequiresPermissions("app:topic:list")
     @GetMapping("/list")
     @ApiOperation(value = "查询话题信息列表", notes = "查询话题信息列表", httpMethod = "GET")
-    public TableDataInfo list(AppTopic appTopic)
+    @ApiIgnore
+    public AjaxResult list(AppTopic appTopic)
     {
-        startPage();
         List<AppTopic> list = appTopicService.selectAppTopicList(appTopic);
-        return getDataTable(list);
+        return success(list);
     }
 
     @GetMapping("/topicList")
diff --git a/gan-ui/src/api/app/topic.js b/gan-ui/src/api/app/topic.js
new file mode 100644
index 0000000..4e3d21f
--- /dev/null
+++ b/gan-ui/src/api/app/topic.js
@@ -0,0 +1,55 @@
+import request from '@/utils/request'
+
+
+// 查询话题信息列表
+export function listAppTopic(query) {
+  return request({
+    url: '/app/topic/topicList',
+    method: 'get',
+    params: query
+  })
+}
+
+
+// 查询话题信息列表
+export function listTopic(query) {
+  return request({
+    url: '/app/topic/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询话题信息详细
+export function getTopic(id) {
+  return request({
+    url: '/app/topic/' + id,
+    method: 'get'
+  })
+}
+
+// 新增话题信息
+export function addTopic(data) {
+  return request({
+    url: '/app/topic/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改话题信息
+export function updateTopic(data) {
+  return request({
+    url: '/app/topic/edit',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除话题信息
+export function delTopic(id) {
+  return request({
+    url: '/app/topic/' + id,
+    method: 'delete'
+  })
+}
diff --git a/gan-ui/src/api/app/user.js b/gan-ui/src/api/app/user.js
new file mode 100644
index 0000000..d4ce7fc
--- /dev/null
+++ b/gan-ui/src/api/app/user.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询app用户列表
+export function listUser(query) {
+  return request({
+    url: '/app/user/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询app用户详细
+export function getUser(id) {
+  return request({
+    url: '/app/user/' + id,
+    method: 'get'
+  })
+}
+
+// 新增app用户
+export function addUser(data) {
+  return request({
+    url: '/app/user',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改app用户
+export function updateUser(data) {
+  return request({
+    url: '/app/user',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除app用户
+export function delUser(id) {
+  return request({
+    url: '/app/user/' + id,
+    method: 'delete'
+  })
+}
diff --git a/gan-ui/src/views/app/topic/index.vue b/gan-ui/src/views/app/topic/index.vue
new file mode 100644
index 0000000..c1796f8
--- /dev/null
+++ b/gan-ui/src/views/app/topic/index.vue
@@ -0,0 +1,309 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="话题名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入话题名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['app:topic:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['app:topic:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['app:topic:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['app:topic:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="topicList"
+      @selection-change="handleSelectionChange"
+      row-key="id"
+      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="话题名称"  :show-overflow-tooltip="true" prop="name" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['app:topic:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['app:topic:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改话题信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="话题类型" prop="menuType">
+              <el-radio-group v-model="form.type">
+                <el-radio label="0">分类</el-radio>
+                <el-radio label="1">话题</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24"  v-if="form.type === '0'">
+            <el-form-item label="话题分类" prop="name">
+              <el-input v-model="form.name" placeholder="请输入话题分类" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24"  v-if="form.type === '1'">
+            <el-form-item label="话题名称" prop="parentId">
+              <el-select
+                v-model="form.parentId"
+                placeholder="请选择话题分类"
+              >
+                <el-option
+                  v-for="item in options"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24"  v-if="form.type === '1'">
+            <el-form-item label="话题名称" prop="name">
+              <el-input v-model="form.name" placeholder="请输入话题名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listTopic, getTopic, delTopic, addTopic, updateTopic ,listAppTopic } from "@/api/app/topic";
+
+export default {
+  name: "Topic",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 话题信息表格数据
+      topicList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: null,
+        updateBy: null,
+        parentId: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      },
+      options: []
+    };
+  },
+  created() {
+    this.getList();
+
+  },
+  methods: {
+    /** 查询话题信息列表 */
+    getAppTopic() {
+
+      this.loading = true;
+      this.queryParams.parentId = 0;
+      this.queryParams.pageNum = 1;
+      this.queryParams.pageSize = 10000;
+      listTopic(this.queryParams).then(response => {
+        this.options = response.data || [];
+        console.log(this.options);
+      });
+    },
+
+
+    /** 查询话题信息列表 */
+    getList() {
+      this.loading = true;
+      listTopic(this.queryParams).then(response => {
+        this.topicList = this.handleTree(response.data, "id");
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        name: null,
+        createTime: null,
+        updateTime: null,
+        createBy: null,
+        updateBy: null,
+        remark: null,
+        type: '0'
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.getAppTopic();
+      this.open = true;
+      this.title = "添加话题信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      this.getAppTopic();
+      const id = row.id || this.ids
+      getTopic(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改话题信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateTopic(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+              this.reset();
+            });
+          } else {
+            addTopic(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除话题信息编号为"' + ids + '"的数据项？').then(function() {
+        return delTopic(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('app/topic/export', {
+        ...this.queryParams
+      }, `topic_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
diff --git a/gan-ui/src/views/app/user/index.vue b/gan-ui/src/views/app/user/index.vue
new file mode 100644
index 0000000..6dfc5ad
--- /dev/null
+++ b/gan-ui/src/views/app/user/index.vue
@@ -0,0 +1,697 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="用户名" prop="username">
+        <el-input
+          v-model="queryParams.username"
+          placeholder="请输入用户名"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="电话" prop="phone">
+        <el-input
+          v-model="queryParams.phone"
+          placeholder="请输入电话"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="地址" prop="address">
+        <el-input
+          v-model="queryParams.address"
+          placeholder="请输入地址"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="学校" prop="school">
+        <el-input
+          v-model="queryParams.school"
+          placeholder="请输入学校"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="专业" prop="major">
+        <el-input
+          v-model="queryParams.major"
+          placeholder="请输入专业"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="学历开始时间" prop="startTime">
+        <el-date-picker clearable
+                        v-model="queryParams.startTime"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="请选择学历开始时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="学历结束时间" prop="endTime">
+        <el-date-picker clearable
+                        v-model="queryParams.endTime"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="请选择学历结束时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="在校经历" prop="experience">
+        <el-input
+          v-model="queryParams.experience"
+          placeholder="请输入在校经历"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="公司名称" prop="companyName">
+        <el-input
+          v-model="queryParams.companyName"
+          placeholder="请输入公司名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="行业" prop="industry">
+        <el-input
+          v-model="queryParams.industry"
+          placeholder="请输入行业"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="在职时间" prop="jobTime">
+        <el-date-picker clearable
+                        v-model="queryParams.jobTime"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="请选择在职时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="职位名称" prop="jobName">
+        <el-input
+          v-model="queryParams.jobName"
+          placeholder="请输入职位名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="技能id" prop="skillId">
+        <el-input
+          v-model="queryParams.skillId"
+          placeholder="请输入技能id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="出生年月" prop="birthday">
+        <el-date-picker clearable
+                        v-model="queryParams.birthday"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="请选择出生年月">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="共享资源" prop="shareResource">
+        <el-input
+          v-model="queryParams.shareResource"
+          placeholder="请输入共享资源"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="是否是技术人员，0是1否" prop="isTech">
+        <el-input
+          v-model="queryParams.isTech"
+          placeholder="请输入是否是技术人员，0是1否"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创业想法" prop="idea">
+        <el-input
+          v-model="queryParams.idea"
+          placeholder="请输入创业想法"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="是否是合伙人,0是1否" prop="isPartner">
+        <el-input
+          v-model="queryParams.isPartner"
+          placeholder="请输入是否是合伙人,0是1否"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="业余爱好" prop="hobby">
+        <el-input
+          v-model="queryParams.hobby"
+          placeholder="请输入业余爱好"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="生活城市" prop="city">
+        <el-input
+          v-model="queryParams.city"
+          placeholder="请输入生活城市"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="其他信息" prop="other">
+        <el-input
+          v-model="queryParams.other"
+          placeholder="请输入其他信息"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="是否是会员0是1否" prop="isMember">
+        <el-input
+          v-model="queryParams.isMember"
+          placeholder="请输入是否是会员0是1否"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="订单记录" prop="orderId">
+        <el-input
+          v-model="queryParams.orderId"
+          placeholder="请输入订单记录"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="开始时间" prop="orderStartTime">
+        <el-date-picker clearable
+                        v-model="queryParams.orderStartTime"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="请选择开始时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="结束时间" prop="orderEndTime">
+        <el-date-picker clearable
+                        v-model="queryParams.orderEndTime"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="请选择结束时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['app:user:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['app:user:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['app:user:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['app:user:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="用户名" align="center" prop="username" />
+      <el-table-column label="邮箱" align="center" prop="email" />
+      <el-table-column label="电话" align="center" prop="phone" />
+      <el-table-column label="地址" align="center" prop="address" />
+      <el-table-column
+          prop="avatarUrl"
+          header-align="center"
+          align="center"
+          label="头像"
+        >
+          <template slot-scope="scope" class="demo-image__preview">
+            <img
+              :src="scope.row.avatarUrl"
+              width="40"
+              height="40"
+              class="head_pic"
+            />
+          </template>
+    </el-table-column>
+      <el-table-column label="学历" align="center" prop="education" />
+      <el-table-column label="学校" align="center" prop="school" />
+      <el-table-column label="专业" align="center" prop="major" />
+      <el-table-column label="学历开始时间" align="center" prop="startTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="学历结束时间" align="center" prop="endTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="在校经历" align="center" prop="experience" />
+      <el-table-column label="公司名称" align="center" prop="companyName" />
+      <el-table-column label="行业" align="center" prop="industry" />
+      <el-table-column label="在职时间" align="center" prop="jobTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.jobTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="职位名称" align="center" prop="jobName" />
+      <el-table-column label="职位类别" align="center" prop="jobType" />
+      <el-table-column label="技能id" align="center" prop="skillId" />
+      <el-table-column label="工作内容" align="center" prop="jobContent" />
+      <el-table-column label="权限：0公开1私密" align="center" prop="type" />
+      <el-table-column label="0:男，1女" align="center" prop="sex" >
+        <template slot-scope="scope">
+          {{ scope.row.sex == 0 ? '男' : scope.row.sex == 1 ? '女' : '' }}
+        </template>
+        </el-table-column>
+      <el-table-column label="出生年月" align="center" prop="birthday" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.birthday, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="共享资源" align="center" prop="shareResource" />
+      <el-table-column label="是否是技术人员，0是1否" align="center" prop="isTech" />
+      <el-table-column label="创业想法" align="center" prop="idea" />
+      <el-table-column label="是否是合伙人,0是1否" align="center" prop="isPartner" />
+      <el-table-column label="业余爱好" align="center" prop="hobby" />
+      <el-table-column label="生活城市" align="center" prop="city" />
+      <el-table-column label="其他信息" align="center" prop="other" />
+      <el-table-column label="是否是会员0是1否" align="center" prop="isMember" />
+      <el-table-column label="订单记录" align="center" prop="orderId" />
+      <el-table-column label="开始时间" align="center" prop="orderStartTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.orderStartTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="结束时间" align="center" prop="orderEndTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.orderEndTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column fixed="right" label="操作" align="center" class-name="small-padding fixed-width" width="150">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="primary"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['app:user:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="danger"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['app:user:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改app用户对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="用户名" prop="username">
+          <el-input v-model="form.username" placeholder="请输入用户名" />
+        </el-form-item>
+        <el-form-item label="密码" prop="password">
+          <el-input v-model="form.password" placeholder="请输入密码" />
+        </el-form-item>
+        <el-form-item label="昵称" prop="nickname">
+          <el-input v-model="form.nickname" placeholder="请输入昵称" />
+        </el-form-item>
+        <el-form-item label="邮箱" prop="email">
+          <el-input v-model="form.email" placeholder="请输入邮箱" />
+        </el-form-item>
+        <el-form-item label="电话" prop="phone">
+          <el-input v-model="form.phone" placeholder="请输入电话" />
+        </el-form-item>
+        <el-form-item label="地址" prop="address">
+          <el-input v-model="form.address" placeholder="请输入地址" />
+        </el-form-item>
+        <el-form-item label="头像" prop="avatarUrl">
+          <el-input v-model="form.avatarUrl" placeholder="请输入头像" />
+        </el-form-item>
+        <el-form-item label="学历" prop="education">
+          <el-input v-model="form.education" placeholder="请输入学历" />
+        </el-form-item>
+        <el-form-item label="学校" prop="school">
+          <el-input v-model="form.school" placeholder="请输入学校" />
+        </el-form-item>
+        <el-form-item label="专业" prop="major">
+          <el-input v-model="form.major" placeholder="请输入专业" />
+        </el-form-item>
+        <el-form-item label="学历开始时间" prop="startTime">
+          <el-date-picker clearable
+                          v-model="form.startTime"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择学历开始时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="学历结束时间" prop="endTime">
+          <el-date-picker clearable
+                          v-model="form.endTime"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择学历结束时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="在校经历" prop="experience">
+          <el-input v-model="form.experience" placeholder="请输入在校经历" />
+        </el-form-item>
+        <el-form-item label="公司名称" prop="companyName">
+          <el-input v-model="form.companyName" placeholder="请输入公司名称" />
+        </el-form-item>
+        <el-form-item label="行业" prop="industry">
+          <el-input v-model="form.industry" placeholder="请输入行业" />
+        </el-form-item>
+        <el-form-item label="在职时间" prop="jobTime">
+          <el-date-picker clearable
+                          v-model="form.jobTime"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择在职时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="职位名称" prop="jobName">
+          <el-input v-model="form.jobName" placeholder="请输入职位名称" />
+        </el-form-item>
+        <el-form-item label="技能id" prop="skillId">
+          <el-input v-model="form.skillId" placeholder="请输入技能id" />
+        </el-form-item>
+        <el-form-item label="工作内容">
+          <editor v-model="form.jobContent" :min-height="192"/>
+        </el-form-item>
+        <el-form-item label="出生年月" prop="birthday">
+          <el-date-picker clearable
+                          v-model="form.birthday"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择出生年月">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="共享资源" prop="shareResource">
+          <el-input v-model="form.shareResource" placeholder="请输入共享资源" />
+        </el-form-item>
+        <el-form-item label="是否是技术人员，0是1否" prop="isTech">
+          <el-input v-model="form.isTech" placeholder="请输入是否是技术人员，0是1否" />
+        </el-form-item>
+        <el-form-item label="创业想法" prop="idea">
+          <el-input v-model="form.idea" placeholder="请输入创业想法" />
+        </el-form-item>
+        <el-form-item label="是否是合伙人,0是1否" prop="isPartner">
+          <el-input v-model="form.isPartner" placeholder="请输入是否是合伙人,0是1否" />
+        </el-form-item>
+        <el-form-item label="业余爱好" prop="hobby">
+          <el-input v-model="form.hobby" placeholder="请输入业余爱好" />
+        </el-form-item>
+        <el-form-item label="生活城市" prop="city">
+          <el-input v-model="form.city" placeholder="请输入生活城市" />
+        </el-form-item>
+        <el-form-item label="其他信息" prop="other">
+          <el-input v-model="form.other" placeholder="请输入其他信息" />
+        </el-form-item>
+        <el-form-item label="是否是会员0是1否" prop="isMember">
+          <el-input v-model="form.isMember" placeholder="请输入是否是会员0是1否" />
+        </el-form-item>
+        <el-form-item label="订单记录" prop="orderId">
+          <el-input v-model="form.orderId" placeholder="请输入订单记录" />
+        </el-form-item>
+        <el-form-item label="开始时间" prop="orderStartTime">
+          <el-date-picker clearable
+                          v-model="form.orderStartTime"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择开始时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="结束时间" prop="orderEndTime">
+          <el-date-picker clearable
+                          v-model="form.orderEndTime"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择结束时间">
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listUser, getUser, delUser, addUser, updateUser } from "@/api/app/user";
+
+export default {
+  name: "User",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // app用户表格数据
+      userList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        username: null,
+        password: null,
+        nickname: null,
+        email: null,
+        phone: null,
+        address: null,
+        avatarUrl: null,
+        education: null,
+        school: null,
+        major: null,
+        startTime: null,
+        endTime: null,
+        experience: null,
+        companyName: null,
+        industry: null,
+        jobTime: null,
+        jobName: null,
+        jobType: null,
+        skillId: null,
+        jobContent: null,
+        type: null,
+        sex: null,
+        birthday: null,
+        shareResource: null,
+        isTech: null,
+        idea: null,
+        isPartner: null,
+        hobby: null,
+        city: null,
+        other: null,
+        isMember: null,
+        orderId: null,
+        orderStartTime: null,
+        orderEndTime: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询app用户列表 */
+    getList() {
+      this.loading = true;
+      listUser(this.queryParams).then(response => {
+        this.userList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        username: null,
+        password: null,
+        nickname: null,
+        email: null,
+        phone: null,
+        address: null,
+        createTime: null,
+        updateTime: null,
+        avatarUrl: null,
+        education: null,
+        school: null,
+        major: null,
+        startTime: null,
+        endTime: null,
+        experience: null,
+        companyName: null,
+        industry: null,
+        jobTime: null,
+        jobName: null,
+        jobType: null,
+        skillId: null,
+        jobContent: null,
+        type: null,
+        sex: null,
+        birthday: null,
+        shareResource: null,
+        isTech: null,
+        idea: null,
+        isPartner: null,
+        hobby: null,
+        city: null,
+        other: null,
+        isMember: null,
+        orderId: null,
+        orderStartTime: null,
+        orderEndTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加app用户";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getUser(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改app用户";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateUser(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addUser(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除app用户编号为"' + ids + '"的数据项？').then(function() {
+        return delUser(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('app/user/export', {
+        ...this.queryParams
+      }, `user_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>