提交

ruoyi-admin/src/main/java/com/ruoyi/web/controller/finance/FncSubjectTypeController.java

-package com.ruoyi.system.controller;
+package com.ruoyi.web.controller.finance;
 
+import ch.qos.logback.core.pattern.ConverterUtil;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.EmptyUtil;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.FncSubjectType;
 import com.ruoyi.system.domain.vo.FncSubjectTypeVo;
@@ -11,12 +15,14 @@ import com.ruoyi.system.service.IFncSubjectTypeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.core.page.TableDataInfo;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -48,6 +54,50 @@ public class FncSubjectTypeController extends BaseController {
         return AjaxResult.success("查询成功", fncSubjectTypeService.queryAll(entity));
     }
 
+    /**
+     * 查询部门列表（排除节点）
+     */
+    @PreAuthorize("@ss.hasPermi('finance:subjectType:list')")
+    @GetMapping("/list/exclude/{id}")
+    public AjaxResult excludeChild(@PathVariable(value = "id", required = false) Long id)
+    {
+        List<FncSubjectType> list = fncSubjectTypeService.list();
+
+        List<Long> ids = new ArrayList<>();
+        //递归获取
+        if (EmptyUtil.isNotEmpty(list) && EmptyUtil.isNotEmpty(id)) {
+            list.stream().filter(item -> item.getParentId() == 0).forEach(item -> {
+                if (item.getSubjectTypeId().equals(id)) {
+                    return;
+                } else {
+                    list.stream().filter(child -> child.getParentId() == item.getSubjectTypeId()).forEach(child -> {
+                        ids.add(child.getSubjectTypeId());
+                        excludeChild(list,child,id,ids);
+                    });
+                }
+            });
+        }
+
+        list.removeIf(d -> d.getSubjectTypeId().intValue() == id || ids.contains(d.getSubjectTypeId()));
+        return success(list);
+    }
+
+    public void excludeChild(List<FncSubjectType> list,FncSubjectType entity, Long id, List<Long> ids) {
+
+        if (EmptyUtil.isNotEmpty(entity)) {
+            if (entity.getSubjectTypeId().equals(id)) {
+                return;
+            } else {
+                list.stream().filter(item -> item.getParentId() == entity.getSubjectTypeId()).forEach(child -> {
+                    ids.add(child.getSubjectTypeId());
+                    excludeChild(list,child,id,ids);
+                });
+            }
+        }
+
+    }
+
+
     @ApiOperation("导出科目类别列表")
     @PreAuthorize("@ss.hasPermi('finance:subjectType:export')")
     @Log(title = "科目类别", businessType = BusinessType.EXPORT)

ruoyi-common/src/main/java/com/ruoyi/common/utils/EmptyUtil.java

+package com.ruoyi.common.utils;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * 一站式健全判空工具类（可判空 集合、字符串、对象 等各种特殊情况）
+ *
+ * @author daizhichao
+ * @date 2021/9/7
+ */
+public class EmptyUtil {
+
+    /**
+     * 对象是否为空
+     *
+     * @param o String,List,Map,Object[],int[],long[]
+     * @return
+     */
+    @SuppressWarnings("rawtypes")
+    public static boolean isEmpty(Object o) {
+        if (o == null) {
+            return true;
+        }
+        if (o instanceof String) {
+            if ("".equals(o.toString().trim())) {
+                return true;
+            }
+        } else if (o instanceof List) {
+            if (((List) o).size() == 0) {
+                return true;
+            }
+        } else if (o instanceof Map) {
+            if (((Map) o).size() == 0) {
+                return true;
+            }
+        } else if (o instanceof Set) {
+            if (((Set) o).size() == 0) {
+                return true;
+            }
+        } else if (o instanceof Object[]) {
+            if (((Object[]) o).length == 0) {
+                return true;
+            }
+        } else if (o instanceof int[]) {
+            if (((int[]) o).length == 0) {
+                return true;
+            }
+        } else if (o instanceof long[]) {
+            if (((long[]) o).length == 0) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static boolean isEmpty(Object... o) {
+        boolean empty = false;
+        for (Object o1 : o) {
+            if (isEmpty(o1)) {
+                empty = true;
+                break;
+            }
+        }
+        return empty;
+    }
+
+    /**
+     * 对象是否不为空
+     *
+     * @param o String,List,Map,Object[],int[],long[]
+     * @return
+     */
+    public static boolean isNotEmpty(Object o) {
+        return !isEmpty(o);
+    }
+
+    /**
+     * 对象组中是否存在 Empty Object
+     *
+     * @param os 对象组
+     * @return
+     */
+    public static boolean isOneEmpty(Object... os) {
+        for (Object o : os) {
+            return isEmpty(o);
+        }
+        return false;
+    }
+
+    /**
+     * 对象组中是否全是 Empty Object
+     *
+     * @param os
+     * @return
+     */
+    public static boolean isAllEmpty(Object... os) {
+        for (Object o : os) {
+            if (!isEmpty(o)) {
+                return false;
+            }
+        }
+        return true;
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/FncSubjectType.java

 package com.ruoyi.system.domain;
 
+import com.baomidou.mybatisplus.annotation.*;
 import com.ruoyi.common.annotation.Excel;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -24,6 +23,7 @@ public class FncSubjectType extends BaseEntity {
     /**
      * 科目类别id
      */
+    @TableId( value = "subject_type_id", type = IdType.AUTO)
     private Long subjectTypeId;
 
     /**
@@ -45,6 +45,8 @@ public class FncSubjectType extends BaseEntity {
     private Integer orderNum;
 
 
+//    @TableLogic(value = "1",delval = "2")
+    @TableField(fill = FieldFill.INSERT)
     private Integer deleteStatus;
 
 }

ruoyi-system/src/main/resources/mapper/finance/FncSubjectTypeMapper.xml

@@ -20,7 +20,7 @@
 
     <select id="queryById" resultType="com.ruoyi.system.domain.vo.FncSubjectTypeVo">
         <include refid="querySql"/>
-        and A.id = #{id}
+        and A.subject_type_id = #{id}
     </select>
 
     <sql id="allField">

ruoyi-ui/src/api/finance/subjectType.js

@@ -8,11 +8,27 @@ export function listSubjectType(query) {
     params: query
   })
 }
+// 查询上级科目类别列表（排除节点）
+export function listExcludeChild(id) {
+  return request({
+    url: '/finance/subjectType/list/exclude/' + id,
+    method: 'get'
+  })
+}
+
+// 查询科目类别所有列表
+export function listAllSubjectType(query) {
+  return request({
+    url: '/finance/subjectType/listAll',
+    method: 'get',
+    params: query
+  })
+}
 
 // 查询科目类别详细
 export function getSubjectType(subjectTypeId) {
   return request({
-    url: '/finance/subjectType/' + subjectTypeId,
+    url: '/finance/subjectType/getInfo/' + subjectTypeId,
     method: 'get'
   })
 }
@@ -29,8 +45,8 @@ export function addSubjectType(data) {
 // 修改科目类别
 export function updateSubjectType(data) {
   return request({
-    url: '/finance/subjectType/update',
-    method: 'put',
+    url: '/finance/subjectType/edit',
+    method: 'post',
     data: data
   })
 }
@@ -38,7 +54,7 @@ export function updateSubjectType(data) {
 // 删除科目类别
 export function delSubjectType(subjectTypeId) {
   return request({
-    url: '/finance/subjectType/' + subjectTypeId,
-    method: 'delete'
+    url: '/finance/subjectType/remove/' + subjectTypeId,
+    method: 'get'
   })
 }

ruoyi-ui/src/utils/ruoyi.js

@@ -167,7 +167,9 @@ export function handleTree(data, id, parentId, children) {
   var childrenListMap = {};
   var nodeIds = {};
   var tree = [];
-
+  if(!data) {
+    return [];
+  }
   for (let d of data) {
     let parentId = d[config.parentId];
     if (childrenListMap[parentId] == null) {

ruoyi-ui/src/views/finance/subjecttype/index.vue

@@ -2,12 +2,8 @@
   <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="subjectTypeName">
-        <el-input
-          v-model="queryParams.subjectTypeName"
-          placeholder="请输入科目类别名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.subjectTypeName" 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>
@@ -17,89 +13,47 @@
 
     <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="['finance:subjectType:add']"
-        >新增</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['finance:subjectType: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="['finance:subjectType:edit']"
-        >修改</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['finance:subjectType: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="['finance:subjectType:remove']"
-        >删除</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['finance:subjectType: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="['finance:subjectType:export']"
-        >导出</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['finance:subjectType:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="subjectTypeList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="科目类别id" align="center" prop="subjectTypeId" />
-      <el-table-column label="上级id" align="center" prop="parentId" />
+    <el-table v-if="refreshTable" v-loading="loading" row-key="subjectTypeId" :data="subjectTypeList"
+      :default-expand-all="isExpandAll" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
+
       <el-table-column label="科目类别名称" align="center" prop="subjectTypeName" />
       <el-table-column label="显示顺序" align="center" prop="orderNum" />
       <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="['finance:subjectType:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['finance:subjectType:remove']"
-          >删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['finance:subjectType:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['finance:subjectType: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-form-item label="上级id" prop="parentId">
-          <el-input v-model="form.parentId" placeholder="请输入上级id" />
+        <el-form-item  label="上级科目" prop="parentId">
+          <treeselect v-model="form.parentId" :options="subjectTypeOptions" :normalizer="normalizer"
+            placeholder="选择上级科目类别" />
         </el-form-item>
         <el-form-item label="科目类别名称" prop="subjectTypeName">
           <el-input v-model="form.subjectTypeName" placeholder="请输入科目类别名称" />
@@ -117,10 +71,13 @@
 </template>
 
 <script>
-import { listSubjectType, getSubjectType, delSubjectType, addSubjectType, updateSubjectType } from "@/api/finance/subjectType";
+import { listAllSubjectType, getSubjectType, delSubjectType, addSubjectType, updateSubjectType ,listExcludeChild} from "@/api/finance/subjectType";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "SubjectType",
+  components: { Treeselect },
   data() {
     return {
       // 遮罩层
@@ -135,16 +92,20 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 科目类别表格数据
+      // 科目类别表格树数据
       subjectTypeList: [],
+      // 科目类别树选项
+      subjectTypeOptions: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
       open: false,
+      // 是否展开，默认全部展开
+      isExpandAll: true,
+      // 重新渲染表格状态
+      refreshTable: true,
       // 查询参数
       queryParams: {
-        pageNum: 1,
-        pageSize: 10,
         subjectTypeName: null,
       },
       // 表单参数
@@ -164,12 +125,23 @@ export default {
     /** 查询科目类别列表 */
     getList() {
       this.loading = true;
-      listSubjectType(this.queryParams).then(response => {
-        this.subjectTypeList = response.rows;
-        this.total = response.total;
+      listAllSubjectType(this.queryParams).then(response => {
+        // this.subjectTypeList = response.rows;
+        this.subjectTypeList = this.handleTree(response.data, "subjectTypeId");
         this.loading = false;
       });
     },
+    /** 转换科目类别数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.subjectTypeId,
+        label: node.subjectTypeName,
+        children: node.children
+      };
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -191,7 +163,6 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
       this.getList();
     },
     /** 重置按钮操作 */
@@ -199,26 +170,47 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.subjectTypeId)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
     /** 新增按钮操作 */
-    handleAdd() {
+    handleAdd(row) {
       this.reset();
+      if (row != undefined) {
+        this.form.parentId = row.subjectTypeId;
+      }
       this.open = true;
       this.title = "添加科目类别";
+      listAllSubjectType().then(response => {
+        this.subjectTypeOptions = this.handleTree(response.data, "subjectTypeId");
+        if (this.subjectTypeOptions.length == 0) {
+
+          }
+          const noResultsOptions = { subjectTypeId: this.form.parentId || 0, subjectTypeName: this.form.parentName || "根节点", children: [] };
+            this.subjectTypeOptions.push(noResultsOptions);
+      });
+    },
+    /** 展开/折叠操作 */
+    toggleExpandAll() {
+      this.refreshTable = false;
+      this.isExpandAll = !this.isExpandAll;
+      this.$nextTick(() => {
+        this.refreshTable = true;
+      });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const subjectTypeId = row.subjectTypeId || this.ids
+      const subjectTypeId = row.subjectTypeId
       getSubjectType(subjectTypeId).then(response => {
         this.form = response.data;
         this.open = true;
         this.title = "修改科目类别";
+        listExcludeChild(row.subjectTypeId).then(response => {
+          this.subjectTypeOptions = this.handleTree(response.data, "subjectTypeId");
+          if (this.subjectTypeOptions.length == 0) {
+
+          }
+          const noResultsOptions = { subjectTypeId: this.form.parentId || 0, subjectTypeName: this.form.parentName || "根节点", children: [] };
+            this.subjectTypeOptions.push(noResultsOptions);
+        });
       });
     },
     /** 提交按钮 */
@@ -244,12 +236,12 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const subjectTypeIds = row.subjectTypeId || this.ids;
-      this.$modal.confirm('是否确认删除科目类别编号为"' + subjectTypeIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除科目类别编号为"' + subjectTypeIds + '"的数据项？').then(function () {
         return delSubjectType(subjectTypeIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {

ruoyi-ui/src/views/system/dept/index.vue

@@ -2,21 +2,12 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
       <el-form-item label="部门名称" prop="deptName">
-        <el-input
-          v-model="queryParams.deptName"
-          placeholder="请输入部门名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.deptName" placeholder="请输入部门名称" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="部门状态" clearable>
-          <el-option
-            v-for="dict in dict.type.sys_normal_disable"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
+          <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label"
+            :value="dict.value" />
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -27,40 +18,22 @@
 
     <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="['system:dept:add']"
-        >新增</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['system:dept:add']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="info"
-          plain
-          icon="el-icon-sort"
-          size="mini"
-          @click="toggleExpandAll"
-        >展开/折叠</el-button>
+        <el-button type="info" plain icon="el-icon-sort" size="mini" @click="toggleExpandAll">展开/折叠</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table
-      v-if="refreshTable"
-      v-loading="loading"
-      :data="deptList"
-      row-key="deptId"
-      :default-expand-all="isExpandAll"
-      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
-    >
+    <el-table v-if="refreshTable" v-loading="loading" :data="deptList" row-key="deptId"
+      :default-expand-all="isExpandAll" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
       <el-table-column prop="deptName" label="部门名称" width="260"></el-table-column>
       <el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
       <el-table-column prop="status" label="状态" width="100">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
+          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status" />
         </template>
       </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" width="200">
@@ -70,28 +43,12 @@
       </el-table-column>
       <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="['system:dept:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-plus"
-            @click="handleAdd(scope.row)"
-            v-hasPermi="['system:dept:add']"
-          >新增</el-button>
-          <el-button
-            v-if="scope.row.parentId != 0"
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['system:dept:remove']"
-          >删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:dept:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-plus" @click="handleAdd(scope.row)"
+            v-hasPermi="['system:dept:add']">新增</el-button>
+          <el-button v-if="scope.row.parentId != 0" size="mini" type="text" icon="el-icon-delete"
+            @click="handleDelete(scope.row)" v-hasPermi="['system:dept:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -102,7 +59,8 @@
         <el-row>
           <el-col :span="24" v-if="form.parentId !== 0">
             <el-form-item label="上级部门" prop="parentId">
-              <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级部门" />
+              <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer"
+                placeholder="选择上级部门" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -139,11 +97,8 @@
           <el-col :span="12">
             <el-form-item label="部门状态">
               <el-radio-group v-model="form.status">
-                <el-radio
-                  v-for="dict in dict.type.sys_normal_disable"
-                  :key="dict.value"
-                  :label="dict.value"
-                >{{dict.label}}</el-radio>
+                <el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.value">
+                  {{ dict.label }}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -307,7 +262,7 @@ export default {
       });
     },
     /** 提交按钮 */
-    submitForm: function() {
+    submitForm: function () {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.deptId != undefined) {
@@ -328,12 +283,12 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      this.$modal.confirm('是否确认删除名称为"' + row.deptName + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除名称为"' + row.deptName + '"的数据项？').then(function () {
         return delDept(row.deptId);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => { });
     }
   }
 };

sql/ry-vue.sql

 /*
  Navicat Premium Data Transfer
 
- Source Server         : 192.168.182.130-mysql
+ Source Server         : localhost_3306
  Source Server Type    : MySQL
- Source Server Version : 50738
- Source Host           : 192.168.182.130:3306
+ Source Server Version : 50736
+ Source Host           : localhost:3306
  Source Schema         : ry-vue
 
  Target Server Type    : MySQL
- Target Server Version : 50738
+ Target Server Version : 50736
  File Encoding         : 65001
 
- Date: 16/11/2022 22:16:16
+ Date: 17/11/2022 17:29:32
 */
 
 SET NAMES utf8mb4;
@@ -31,11 +31,11 @@ CREATE TABLE `fnc_company`  (
   `bank_account_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '银行账户名称',
   `bank_account` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '银行账户',
   `create_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
-  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
   `update_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
-  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+  `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
   PRIMARY KEY (`company_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '记账公司表' ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '记账公司表' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of fnc_company
@@ -60,11 +60,11 @@ CREATE TABLE `fnc_ledger`  (
   `business_type` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '业务性质',
   `sale_evaluation` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '销售额评估',
   `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
-  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
   `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
-  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+  `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
   PRIMARY KEY (`ledger_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 16760 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '项目台账' ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB AUTO_INCREMENT = 16760 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '项目台账' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of fnc_ledger
@@ -2353,6 +2353,31 @@ INSERT INTO `fnc_ledger` VALUES (16757, '全系列', '2022-11-15', '杭州耀恒
 INSERT INTO `fnc_ledger` VALUES (16758, '全系列', '2022-11-15', '山东品派无纺布制品有限公司', '孙凌云', '13361520666', '20221115', '李小龙', '山东品派无纺布制品有限公司', '内贸', '0万', 'admin', '2022-11-16 22:14:51', 'admin', '2022-11-16 22:14:51');
 INSERT INTO `fnc_ledger` VALUES (16759, '全系列', '2022-11-15', '泉州瑞尔无纺布有限公司', '陈燕瑞', '13905058650', '20221115', '李小龙', '泉州瑞尔无纺布有限公司', '内贸', '0万', 'admin', '2022-11-16 22:14:51', 'admin', '2022-11-16 22:14:51');
 
+-- ----------------------------
+-- Table structure for fnc_subject_type
+-- ----------------------------
+DROP TABLE IF EXISTS `fnc_subject_type`;
+CREATE TABLE `fnc_subject_type`  (
+  `subject_type_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '科目类别id',
+  `parent_id` bigint(20) NULL DEFAULT 0 COMMENT '上级id',
+  `subject_type_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '科目类别名称',
+  `order_num` int(4) NULL DEFAULT NULL COMMENT '显示顺序',
+  `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
+  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
+  `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
+  `delete_status` int(4) NULL DEFAULT NULL COMMENT '是否删除',
+  PRIMARY KEY (`subject_type_id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '科目类别' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of fnc_subject_type
+-- ----------------------------
+INSERT INTO `fnc_subject_type` VALUES (1, 0, '3', 3, 'admin', '2022-11-17 14:06:27', 'admin', '2022-11-17 14:06:27', 2);
+INSERT INTO `fnc_subject_type` VALUES (2, 0, '1-1', 1, 'admin', '2022-11-17 16:49:38', 'admin', '2022-11-17 16:49:38', 2);
+INSERT INTO `fnc_subject_type` VALUES (3, 0, '3', 3, 'admin', '2022-11-17 17:00:41', 'admin', '2022-11-17 17:00:41', NULL);
+INSERT INTO `fnc_subject_type` VALUES (4, 0, '1-2', 2, 'admin', '2022-11-17 17:12:03', 'admin', '2022-11-17 17:12:03', 1);
+
 -- ----------------------------
 -- Table structure for gen_table
 -- ----------------------------
@@ -2374,18 +2399,19 @@ CREATE TABLE `gen_table`  (
   `gen_path` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '/' COMMENT '生成路径（不填默认项目路径）',
   `options` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '其它生成选项',
   `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '创建者',
-  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
   `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '更新者',
-  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+  `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
   `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
   PRIMARY KEY (`table_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 20 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '代码生成业务表' ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB AUTO_INCREMENT = 21 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '代码生成业务表' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of gen_table
 -- ----------------------------
 INSERT INTO `gen_table` VALUES (18, 'fnc_company', '记账公司表', NULL, NULL, 'FncCompany', 'crud', 'com.ruoyi.system', 'system', 'company', '记账公司', 'ruoyi', '0', '/', NULL, 'admin', '2022-11-16 11:35:57', '', NULL, NULL);
 INSERT INTO `gen_table` VALUES (19, 'fnc_ledger', '项目台账', NULL, NULL, 'FncLedger', 'crud', 'com.ruoyi.finance', 'finance', 'ledger', '项目台账', 'ruoyi', '0', '/', '{}', 'admin', '2022-11-16 14:39:19', '', '2022-11-16 14:41:51', NULL);
+INSERT INTO `gen_table` VALUES (20, 'fnc_subject_type', '科目类别', NULL, NULL, 'FncSubjectType', 'crud', 'com.ruoyi.system', 'system', 'subjectType', '科目类别', 'jlf', '0', '/', '{}', 'admin', '2022-11-17 10:37:45', '', '2022-11-17 10:39:33', NULL);
 
 -- ----------------------------
 -- Table structure for gen_table_column
@@ -2411,27 +2437,27 @@ CREATE TABLE `gen_table_column`  (
   `dict_type` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '字典类型',
   `sort` int(11) NULL DEFAULT NULL COMMENT '排序',
   `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '创建者',
-  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
   `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '更新者',
-  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+  `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
   PRIMARY KEY (`column_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 202 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '代码生成业务表字段' ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB AUTO_INCREMENT = 211 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '代码生成业务表字段' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of gen_table_column
 -- ----------------------------
-INSERT INTO `gen_table_column` VALUES (174, '18', 'company_id', '记账公司id', 'bigint(20)', 'Long', 'companyId', '1', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 1, 'admin', '2022-11-16 11:35:57', '', NULL);
-INSERT INTO `gen_table_column` VALUES (175, '18', 'company_name', '记账公司名称', 'varchar(50)', 'String', 'companyName', '0', '0', NULL, '1', '1', '1', '1', 'LIKE', 'input', '', 2, 'admin', '2022-11-16 11:35:57', '', NULL);
-INSERT INTO `gen_table_column` VALUES (176, '18', 'license_no', '营业执照号', 'varchar(50)', 'String', 'licenseNo', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 3, 'admin', '2022-11-16 11:35:57', '', NULL);
-INSERT INTO `gen_table_column` VALUES (177, '18', 'company_address', '公司地址', 'varchar(100)', 'String', 'companyAddress', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 4, 'admin', '2022-11-16 11:35:57', '', NULL);
-INSERT INTO `gen_table_column` VALUES (178, '18', 'contact_information', '联系方式', 'varchar(50)', 'String', 'contactInformation', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 5, 'admin', '2022-11-16 11:35:57', '', NULL);
-INSERT INTO `gen_table_column` VALUES (179, '18', 'bank_deposit', '开户行', 'varchar(100)', 'String', 'bankDeposit', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 6, 'admin', '2022-11-16 11:35:57', '', NULL);
-INSERT INTO `gen_table_column` VALUES (180, '18', 'bank_account_name', '银行账户名称', 'varchar(100)', 'String', 'bankAccountName', '0', '0', NULL, '1', '1', '1', '1', 'LIKE', 'input', '', 7, 'admin', '2022-11-16 11:35:57', '', NULL);
-INSERT INTO `gen_table_column` VALUES (181, '18', 'bank_account', '银行账户', 'varchar(100)', 'String', 'bankAccount', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 8, 'admin', '2022-11-16 11:35:57', '', NULL);
-INSERT INTO `gen_table_column` VALUES (182, '18', 'create_by', '创建人', 'varchar(255)', 'String', 'createBy', '0', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 9, 'admin', '2022-11-16 11:35:57', '', NULL);
-INSERT INTO `gen_table_column` VALUES (183, '18', 'create_time', '创建时间', 'datetime', 'Date', 'createTime', '0', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'datetime', '', 10, 'admin', '2022-11-16 11:35:57', '', NULL);
-INSERT INTO `gen_table_column` VALUES (184, '18', 'update_by', '更新人', 'varchar(255)', 'String', 'updateBy', '0', '0', NULL, '1', '1', NULL, NULL, 'EQ', 'input', '', 11, 'admin', '2022-11-16 11:35:57', '', NULL);
-INSERT INTO `gen_table_column` VALUES (185, '18', 'update_time', '更新时间', 'datetime', 'Date', 'updateTime', '0', '0', NULL, '1', '1', NULL, NULL, 'EQ', 'datetime', '', 12, 'admin', '2022-11-16 11:35:57', '', NULL);
+INSERT INTO `gen_table_column` VALUES (174, '18', 'company_id', '记账公司id', 'bigint(20)', 'Long', 'companyId', '1', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 1, 'admin', '2022-11-16 11:35:57', '', '2022-11-17 10:59:46');
+INSERT INTO `gen_table_column` VALUES (175, '18', 'company_name', '记账公司名称', 'varchar(50)', 'String', 'companyName', '0', '0', NULL, '1', '1', '1', '1', 'LIKE', 'input', '', 2, 'admin', '2022-11-16 11:35:57', '', '2022-11-17 10:59:46');
+INSERT INTO `gen_table_column` VALUES (176, '18', 'license_no', '营业执照号', 'varchar(50)', 'String', 'licenseNo', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 3, 'admin', '2022-11-16 11:35:57', '', '2022-11-17 10:59:46');
+INSERT INTO `gen_table_column` VALUES (177, '18', 'company_address', '公司地址', 'varchar(100)', 'String', 'companyAddress', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 4, 'admin', '2022-11-16 11:35:57', '', '2022-11-17 10:59:46');
+INSERT INTO `gen_table_column` VALUES (178, '18', 'contact_information', '联系方式', 'varchar(50)', 'String', 'contactInformation', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 5, 'admin', '2022-11-16 11:35:57', '', '2022-11-17 10:59:46');
+INSERT INTO `gen_table_column` VALUES (179, '18', 'bank_deposit', '开户行', 'varchar(100)', 'String', 'bankDeposit', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 6, 'admin', '2022-11-16 11:35:57', '', '2022-11-17 10:59:46');
+INSERT INTO `gen_table_column` VALUES (180, '18', 'bank_account_name', '银行账户名称', 'varchar(100)', 'String', 'bankAccountName', '0', '0', NULL, '1', '1', '1', '1', 'LIKE', 'input', '', 7, 'admin', '2022-11-16 11:35:57', '', '2022-11-17 10:59:46');
+INSERT INTO `gen_table_column` VALUES (181, '18', 'bank_account', '银行账户', 'varchar(100)', 'String', 'bankAccount', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 8, 'admin', '2022-11-16 11:35:57', '', '2022-11-17 10:59:46');
+INSERT INTO `gen_table_column` VALUES (182, '18', 'create_by', '创建人', 'varchar(255)', 'String', 'createBy', '0', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 9, 'admin', '2022-11-16 11:35:57', '', '2022-11-17 10:59:46');
+INSERT INTO `gen_table_column` VALUES (183, '18', 'create_time', '创建时间', 'datetime', 'Date', 'createTime', '0', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'datetime', '', 10, 'admin', '2022-11-16 11:35:57', '', '2022-11-17 10:59:46');
+INSERT INTO `gen_table_column` VALUES (184, '18', 'update_by', '更新人', 'varchar(255)', 'String', 'updateBy', '0', '0', NULL, '1', '1', NULL, NULL, 'EQ', 'input', '', 11, 'admin', '2022-11-16 11:35:57', '', '2022-11-17 10:59:46');
+INSERT INTO `gen_table_column` VALUES (185, '18', 'update_time', '更新时间', 'datetime', 'Date', 'updateTime', '0', '0', NULL, '1', '1', NULL, NULL, 'EQ', 'datetime', '', 12, 'admin', '2022-11-16 11:35:57', '', '2022-11-17 10:59:46');
 INSERT INTO `gen_table_column` VALUES (186, '19', 'ledger_id', '项目台账id', 'bigint(50)', 'Long', 'ledgerId', '1', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 1, 'admin', '2022-11-16 14:39:19', '', '2022-11-16 14:59:43');
 INSERT INTO `gen_table_column` VALUES (187, '19', 'project_type', '分类', 'varchar(20)', 'String', 'projectType', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'select', '', 2, 'admin', '2022-11-16 14:39:19', '', '2022-11-16 14:59:43');
 INSERT INTO `gen_table_column` VALUES (188, '19', 'date', '日期', 'date', 'Date', 'date', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'datetime', '', 3, 'admin', '2022-11-16 14:39:19', '', '2022-11-16 14:59:43');
@@ -2447,6 +2473,15 @@ INSERT INTO `gen_table_column` VALUES (198, '19', 'create_time', '创建时间',
 INSERT INTO `gen_table_column` VALUES (199, '19', 'update_by', '更新人', 'varchar(64)', 'String', 'updateBy', '0', '0', NULL, '1', '1', NULL, NULL, 'EQ', 'input', '', 14, 'admin', '2022-11-16 14:39:19', '', '2022-11-16 14:59:43');
 INSERT INTO `gen_table_column` VALUES (200, '19', 'update_time', '更新时间', 'datetime', 'Date', 'updateTime', '0', '0', NULL, '1', '1', NULL, NULL, 'EQ', 'datetime', '', 15, 'admin', '2022-11-16 14:39:19', '', '2022-11-16 14:59:43');
 INSERT INTO `gen_table_column` VALUES (201, '19', 'create_by', '创建人', 'varchar(64)', 'String', 'createBy', '0', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 12, '', '2022-11-16 14:59:43', '', NULL);
+INSERT INTO `gen_table_column` VALUES (202, '20', 'subject_type_id', '科目类别id', 'bigint(20)', 'Long', 'subjectTypeId', '1', '1', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 1, 'admin', '2022-11-17 10:37:45', '', '2022-11-17 14:05:37');
+INSERT INTO `gen_table_column` VALUES (203, '20', 'parent_id', '上级id', 'bigint(20)', 'Long', 'parentId', '0', '0', '1', '1', '1', '1', '1', 'EQ', 'input', '', 2, 'admin', '2022-11-17 10:37:45', '', '2022-11-17 14:05:37');
+INSERT INTO `gen_table_column` VALUES (204, '20', 'subject_type_name', '科目类别名称', 'varchar(50)', 'String', 'subjectTypeName', '0', '0', NULL, '1', '1', '1', '1', 'LIKE', 'input', '', 3, 'admin', '2022-11-17 10:37:45', '', '2022-11-17 14:05:37');
+INSERT INTO `gen_table_column` VALUES (205, '20', 'order_num', '显示顺序', 'int(4)', 'Integer', 'orderNum', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 4, 'admin', '2022-11-17 10:37:45', '', '2022-11-17 14:05:37');
+INSERT INTO `gen_table_column` VALUES (206, '20', 'create_by', '创建人', 'varchar(64)', 'String', 'createBy', '0', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 5, 'admin', '2022-11-17 10:37:45', '', '2022-11-17 14:05:37');
+INSERT INTO `gen_table_column` VALUES (207, '20', 'create_time', '创建时间', 'datetime', 'Date', 'createTime', '0', '0', NULL, '1', NULL, NULL, NULL, 'EQ', 'datetime', '', 6, 'admin', '2022-11-17 10:37:45', '', '2022-11-17 14:05:37');
+INSERT INTO `gen_table_column` VALUES (208, '20', 'update_by', '更新人', 'varchar(64)', 'String', 'updateBy', '0', '0', NULL, '1', '1', NULL, NULL, 'EQ', 'input', '', 7, 'admin', '2022-11-17 10:37:45', '', '2022-11-17 14:05:37');
+INSERT INTO `gen_table_column` VALUES (209, '20', 'update_time', '更新时间', 'datetime', 'Date', 'updateTime', '0', '0', NULL, '1', '1', NULL, NULL, 'EQ', 'datetime', '', 8, 'admin', '2022-11-17 10:37:45', '', '2022-11-17 14:05:37');
+INSERT INTO `gen_table_column` VALUES (210, '20', 'delete_status', '是否删除', 'int(4)', 'Integer', 'deleteStatus', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'radio', '', 9, '', '2022-11-17 14:05:37', '', NULL);
 
 -- ----------------------------
 -- Table structure for sys_config
@@ -2459,12 +2494,12 @@ CREATE TABLE `sys_config`  (
   `config_value` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '参数键值',
   `config_type` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'N' COMMENT '系统内置（Y是 N否）',
   `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '创建者',
-  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
   `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '更新者',
-  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+  `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
   `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
   PRIMARY KEY (`config_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 100 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '参数配置表' ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB AUTO_INCREMENT = 100 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '参数配置表' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of sys_config
@@ -2491,11 +2526,11 @@ CREATE TABLE `sys_dept`  (
   `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '部门状态（0正常 1停用）',
   `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）',
   `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '创建者',
-  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
   `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '更新者',
-  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+  `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
   PRIMARY KEY (`dept_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 200 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '部门表' ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB AUTO_INCREMENT = 201 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '部门表' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of sys_dept
@@ -2510,6 +2545,7 @@ INSERT INTO `sys_dept` VALUES (106, 101, '0,100,101', '财务部门', 4, '若依
 INSERT INTO `sys_dept` VALUES (107, 101, '0,100,101', '运维部门', 5, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', '2022-11-16 09:26:25', '', NULL);
 INSERT INTO `sys_dept` VALUES (108, 102, '0,100,102', '市场部门', 1, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', '2022-11-16 09:26:25', '', NULL);
 INSERT INTO `sys_dept` VALUES (109, 102, '0,100,102', '财务部门', 2, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', '2022-11-16 09:26:25', '', NULL);
+INSERT INTO `sys_dept` VALUES (200, 103, '0,100,101,103', 'test', 3, 'test', NULL, NULL, '0', '0', 'admin', '2022-11-17 15:04:56', '', NULL);
 
 -- ----------------------------
 -- Table structure for sys_dict_data
@@ -2526,12 +2562,12 @@ CREATE TABLE `sys_dict_data`  (
   `is_default` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'N' COMMENT '是否默认（Y是 N否）',
   `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '状态（0正常 1停用）',
   `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '创建者',
-  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
   `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '更新者',
-  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+  `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
   `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
   PRIMARY KEY (`dict_code`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 102 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '字典数据表' ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB AUTO_INCREMENT = 102 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '字典数据表' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of sys_dict_data
@@ -2578,13 +2614,13 @@ CREATE TABLE `sys_dict_type`  (
   `dict_type` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '字典类型',
   `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '状态（0正常 1停用）',
   `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '创建者',
-  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
   `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '更新者',
-  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+  `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
   `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
   PRIMARY KEY (`dict_id`) USING BTREE,
   UNIQUE INDEX `dict_type`(`dict_type`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 101 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '字典类型表' ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB AUTO_INCREMENT = 101 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '字典类型表' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of sys_dict_type
@@ -2615,12 +2651,12 @@ CREATE TABLE `sys_job`  (
   `concurrent` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '1' COMMENT '是否并发执行（0允许 1禁止）',
   `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '状态（0正常 1暂停）',
   `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '创建者',
-  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
   `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '更新者',
-  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+  `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
   `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '备注信息',
   PRIMARY KEY (`job_id`, `job_name`, `job_group`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 100 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '定时任务调度表' ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB AUTO_INCREMENT = 100 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '定时任务调度表' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of sys_job
@@ -2641,9 +2677,9 @@ CREATE TABLE `sys_job_log`  (
   `job_message` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '日志信息',
   `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '执行状态（0正常 1失败）',
   `exception_info` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '异常信息',
-  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
   PRIMARY KEY (`job_log_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '定时任务调度日志表' ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '定时任务调度日志表' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of sys_job_log
@@ -2662,9 +2698,9 @@ CREATE TABLE `sys_logininfor`  (
   `os` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '操作系统',
   `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '登录状态（0成功 1失败）',
   `msg` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '提示消息',
-  `login_time` datetime NULL DEFAULT NULL COMMENT '访问时间',
+  `login_time` datetime(0) NULL DEFAULT NULL COMMENT '访问时间',
   PRIMARY KEY (`info_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 117 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统访问记录' ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB AUTO_INCREMENT = 129 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统访问记录' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of sys_logininfor
@@ -2686,6 +2722,18 @@ INSERT INTO `sys_logininfor` VALUES (113, 'admin', '127.0.0.1', '内网IP', 'Chr
 INSERT INTO `sys_logininfor` VALUES (114, 'admin', '127.0.0.1', '内网IP', 'Chrome 10', 'Windows 10', '0', '登录成功', '2022-11-16 13:14:59');
 INSERT INTO `sys_logininfor` VALUES (115, 'admin', '127.0.0.1', '内网IP', 'Chrome 10', 'Windows 10', '0', '退出成功', '2022-11-16 13:17:01');
 INSERT INTO `sys_logininfor` VALUES (116, 'admin', '127.0.0.1', '内网IP', 'Chrome 10', 'Windows 10', '0', '登录成功', '2022-11-16 13:17:07');
+INSERT INTO `sys_logininfor` VALUES (117, 'admin', '127.0.0.1', '内网IP', 'Chrome 10', 'Windows 10', '0', '登录成功', '2022-11-17 09:09:28');
+INSERT INTO `sys_logininfor` VALUES (118, 'admin', '127.0.0.1', '内网IP', 'Chrome 10', 'Windows 10', '0', '登录成功', '2022-11-17 09:58:40');
+INSERT INTO `sys_logininfor` VALUES (119, 'admin', '127.0.0.1', '内网IP', 'Chrome 10', 'Windows 10', '1', '验证码错误', '2022-11-17 11:52:07');
+INSERT INTO `sys_logininfor` VALUES (120, 'admin', '127.0.0.1', '内网IP', 'Chrome 10', 'Windows 10', '0', '登录成功', '2022-11-17 11:52:10');
+INSERT INTO `sys_logininfor` VALUES (121, 'admin', '127.0.0.1', '内网IP', 'Chrome 10', 'Windows 10', '0', '退出成功', '2022-11-17 11:57:52');
+INSERT INTO `sys_logininfor` VALUES (122, 'admin', '127.0.0.1', '内网IP', 'Chrome 10', 'Windows 10', '0', '登录成功', '2022-11-17 11:59:07');
+INSERT INTO `sys_logininfor` VALUES (123, 'admin', '127.0.0.1', '内网IP', 'Chrome 10', 'Windows 10', '0', '退出成功', '2022-11-17 12:00:30');
+INSERT INTO `sys_logininfor` VALUES (124, 'admin', '127.0.0.1', '内网IP', 'Chrome 10', 'Windows 10', '0', '登录成功', '2022-11-17 12:00:34');
+INSERT INTO `sys_logininfor` VALUES (125, 'admin', '127.0.0.1', '内网IP', 'Chrome 10', 'Windows 10', '0', '登录成功', '2022-11-17 13:55:52');
+INSERT INTO `sys_logininfor` VALUES (126, 'admin', '127.0.0.1', '内网IP', 'Chrome 10', 'Windows 10', '1', '验证码错误', '2022-11-17 15:57:38');
+INSERT INTO `sys_logininfor` VALUES (127, 'admin', '127.0.0.1', '内网IP', 'Chrome 10', 'Windows 10', '1', '验证码错误', '2022-11-17 15:57:43');
+INSERT INTO `sys_logininfor` VALUES (128, 'admin', '127.0.0.1', '内网IP', 'Chrome 10', 'Windows 10', '0', '登录成功', '2022-11-17 15:57:48');
 
 -- ----------------------------
 -- Table structure for sys_menu
@@ -2707,12 +2755,12 @@ CREATE TABLE `sys_menu`  (
   `perms` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '权限标识',
   `icon` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '#' COMMENT '菜单图标',
   `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '创建者',
-  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
   `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '更新者',
-  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+  `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
   `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '备注',
   PRIMARY KEY (`menu_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 2014 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '菜单权限表' ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB AUTO_INCREMENT = 2021 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '菜单权限表' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of sys_menu
@@ -2814,6 +2862,13 @@ INSERT INTO `sys_menu` VALUES (2010, '项目台账修改', 2007, 3, '#', '', NUL
 INSERT INTO `sys_menu` VALUES (2011, '项目台账删除', 2007, 4, '#', '', NULL, 1, 0, 'F', '0', '0', 'finance:ledger:remove', '#', 'admin', '2022-11-16 14:51:16', '', NULL, '');
 INSERT INTO `sys_menu` VALUES (2012, '项目台账导出', 2007, 5, '#', '', NULL, 1, 0, 'F', '0', '0', 'finance:ledger:export', '#', 'admin', '2022-11-16 14:51:16', '', NULL, '');
 INSERT INTO `sys_menu` VALUES (2013, '项目台账导入', 2007, 6, '', NULL, NULL, 1, 0, 'F', '0', '0', 'finance:ledger:import', '#', 'admin', '2022-11-16 15:44:33', 'admin', '2022-11-16 15:44:51', '');
+INSERT INTO `sys_menu` VALUES (2014, '记账科目管理', 2000, 2, 'subject', NULL, NULL, 1, 0, 'M', '0', '0', '', 'job', 'admin', '2022-11-17 09:31:02', 'admin', '2022-11-17 12:02:38', '');
+INSERT INTO `sys_menu` VALUES (2015, '科目类别', 2014, 1, 'subjecttype', 'finance/subjecttype/index', NULL, 1, 0, 'C', '0', '0', 'finance:subjectType:list', '#', 'admin', '2022-11-17 11:56:57', 'admin', '2022-11-17 12:03:17', '科目类别菜单');
+INSERT INTO `sys_menu` VALUES (2016, '科目类别查询', 2015, 1, '#', '', NULL, 1, 0, 'F', '0', '0', 'finance:subjectType:query', '#', 'admin', '2022-11-17 11:56:57', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2017, '科目类别新增', 2015, 2, '#', '', NULL, 1, 0, 'F', '0', '0', 'finance:subjectType:add', '#', 'admin', '2022-11-17 11:56:57', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2018, '科目类别修改', 2015, 3, '#', '', NULL, 1, 0, 'F', '0', '0', 'finance:subjectType:edit', '#', 'admin', '2022-11-17 11:56:57', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2019, '科目类别删除', 2015, 4, '#', '', NULL, 1, 0, 'F', '0', '0', 'finance:subjectType:remove', '#', 'admin', '2022-11-17 11:56:57', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2020, '科目类别导出', 2015, 5, '#', '', NULL, 1, 0, 'F', '0', '0', 'finance:subjectType:export', '#', 'admin', '2022-11-17 11:56:57', '', NULL, '');
 
 -- ----------------------------
 -- Table structure for sys_notice
@@ -2826,12 +2881,12 @@ CREATE TABLE `sys_notice`  (
   `notice_content` longblob NULL COMMENT '公告内容',
   `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '公告状态（0正常 1关闭）',
   `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '创建者',
-  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
   `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '更新者',
-  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+  `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
   `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
   PRIMARY KEY (`notice_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 10 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '通知公告表' ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB AUTO_INCREMENT = 10 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '通知公告表' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of sys_notice
@@ -2859,9 +2914,9 @@ CREATE TABLE `sys_oper_log`  (
   `json_result` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '返回参数',
   `status` int(1) NULL DEFAULT 0 COMMENT '操作状态（0正常 1异常）',
   `error_msg` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '错误消息',
-  `oper_time` datetime NULL DEFAULT NULL COMMENT '操作时间',
+  `oper_time` datetime(0) NULL DEFAULT NULL COMMENT '操作时间',
   PRIMARY KEY (`oper_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 170 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '操作日志记录' ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB AUTO_INCREMENT = 190 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '操作日志记录' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of sys_oper_log
@@ -2936,6 +2991,26 @@ INSERT INTO `sys_oper_log` VALUES (166, '项目台账', 6, 'com.ruoyi.web.contro
 INSERT INTO `sys_oper_log` VALUES (167, '项目台账', 6, 'com.ruoyi.web.controller.finance.FncLedgerController.importData()', 'POST', 1, 'admin', NULL, '/finance/ledger/import', '127.0.0.1', '内网IP', 'false', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-11-16 14:09:28');
 INSERT INTO `sys_oper_log` VALUES (168, '项目台账', 6, 'com.ruoyi.web.controller.finance.FncLedgerController.importData()', 'POST', 1, 'admin', NULL, '/finance/ledger/import', '127.0.0.1', '内网IP', 'false', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-11-16 14:11:05');
 INSERT INTO `sys_oper_log` VALUES (169, '项目台账', 6, 'com.ruoyi.web.controller.finance.FncLedgerController.importData()', 'POST', 1, 'admin', NULL, '/finance/ledger/import', '127.0.0.1', '内网IP', 'false', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-11-16 14:14:51');
+INSERT INTO `sys_oper_log` VALUES (170, '菜单管理', 1, 'com.ruoyi.web.controller.system.SysMenuController.add()', 'POST', 1, 'admin', NULL, '/system/menu', '127.0.0.1', '内网IP', '{\"children\":[],\"createBy\":\"admin\",\"icon\":\"job\",\"isCache\":\"0\",\"isFrame\":\"1\",\"menuName\":\"记账科目管理\",\"menuType\":\"M\",\"orderNum\":2,\"params\":{},\"parentId\":2000,\"path\":\"subject\",\"status\":\"0\",\"visible\":\"0\"}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-11-17 09:31:02');
+INSERT INTO `sys_oper_log` VALUES (171, '代码生成', 6, 'com.ruoyi.generator.controller.GenController.importTableSave()', 'POST', 1, 'admin', NULL, '/tool/gen/importTable', '127.0.0.1', '内网IP', '\"fnc_subject_type\"', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-11-17 10:37:45');
+INSERT INTO `sys_oper_log` VALUES (172, '代码生成', 2, 'com.ruoyi.generator.controller.GenController.editSave()', 'PUT', 1, 'admin', NULL, '/tool/gen', '127.0.0.1', '内网IP', '{\"businessName\":\"subjectType\",\"className\":\"FncSubjectType\",\"columns\":[{\"capJavaField\":\"SubjectTypeId\",\"columnComment\":\"科目类别id\",\"columnId\":202,\"columnName\":\"subject_type_id\",\"columnType\":\"bigint(20)\",\"createBy\":\"admin\",\"createTime\":\"2022-11-17 10:37:45\",\"dictType\":\"\",\"edit\":false,\"htmlType\":\"input\",\"increment\":true,\"insert\":true,\"isIncrement\":\"1\",\"isInsert\":\"1\",\"isPk\":\"1\",\"javaField\":\"subjectTypeId\",\"javaType\":\"Long\",\"list\":false,\"params\":{},\"pk\":true,\"query\":false,\"queryType\":\"EQ\",\"required\":false,\"sort\":1,\"superColumn\":false,\"tableId\":20,\"updateBy\":\"\",\"usableColumn\":false},{\"capJavaField\":\"ParentId\",\"columnComment\":\"上级id\",\"columnId\":203,\"columnName\":\"parent_id\",\"columnType\":\"bigint(20)\",\"createBy\":\"admin\",\"createTime\":\"2022-11-17 10:37:45\",\"dictType\":\"\",\"edit\":true,\"htmlType\":\"input\",\"increment\":false,\"insert\":true,\"isEdit\":\"1\",\"isIncrement\":\"0\",\"isInsert\":\"1\",\"isList\":\"1\",\"isPk\":\"0\",\"isQuery\":\"0\",\"isRequired\":\"1\",\"javaField\":\"parentId\",\"javaType\":\"Long\",\"list\":true,\"params\":{},\"pk\":false,\"query\":false,\"queryType\":\"EQ\",\"required\":true,\"sort\":2,\"superColumn\":true,\"tableId\":20,\"updateBy\":\"\",\"usableColumn\":true},{\"capJavaField\":\"SubjectTypeName\",\"columnComment\":\"科目类别名称\",\"columnId\":204,\"columnName\":\"subject_type_name\",\"columnType\":\"varchar(50)\",\"createBy\":\"admin\",\"createTime\":\"2022-11-17 10:37:45\",\"dictType\":\"\",\"edit\":true,\"htmlType\":\"input\",\"increment\":false,\"insert\":true,\"isEdit\":\"1\",\"isIncrement\":\"0\",\"isInsert\":\"1\",\"isList\":\"1\",\"isPk\":\"0\",\"isQuery\":\"1\",\"javaField\":\"subjectTypeName\",\"javaType\":\"String\",\"list\":true,\"params\":{},\"pk\":false,\"query\":true,\"queryType\":\"LIKE\",\"required\":false,\"sort\":3,\"superColumn\":false,\"tableId\":20,\"updateBy\":\"\",\"usableColumn\":false},{\"capJavaField\":\"OrderNum\",\"columnComment\":\"显示顺序\",\"columnId\":205,\"columnName\":\"order_num\",\"columnType\":\"int(4)\",\"createBy\":\"admin\",\"createTime\":\"2022-11-17 10:37:45\",\"dictType\":\"\",\"edit\":true,\"htmlType\":\"input\",\"increment\":false,\"insert\":true,\"isEdit\":\"1\",\"isIncrement\":\"0\",\"isInsert\":\"1\",\"isList\":\"1\",\"isPk\":\"0', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-11-17 10:39:33');
+INSERT INTO `sys_oper_log` VALUES (173, '代码生成', 8, 'com.ruoyi.generator.controller.GenController.batchGenCode()', 'GET', 1, 'admin', NULL, '/tool/gen/batchGenCode', '127.0.0.1', '内网IP', '{}', NULL, 0, NULL, '2022-11-17 10:47:20');
+INSERT INTO `sys_oper_log` VALUES (174, '代码生成', 2, 'com.ruoyi.generator.controller.GenController.synchDb()', 'GET', 1, 'admin', NULL, '/tool/gen/synchDb/fnc_company', '127.0.0.1', '内网IP', '{tableName=fnc_company}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-11-17 10:59:46');
+INSERT INTO `sys_oper_log` VALUES (175, '代码生成', 2, 'com.ruoyi.generator.controller.GenController.synchDb()', 'GET', 1, 'admin', NULL, '/tool/gen/synchDb/fnc_subject_type', '127.0.0.1', '内网IP', '{tableName=fnc_subject_type}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-11-17 11:00:08');
+INSERT INTO `sys_oper_log` VALUES (176, '菜单管理', 2, 'com.ruoyi.web.controller.system.SysMenuController.edit()', 'PUT', 1, 'admin', NULL, '/system/menu', '127.0.0.1', '内网IP', '{\"children\":[],\"component\":\"finance/subjectype/index\",\"createTime\":\"2022-11-17 11:56:57\",\"icon\":\"#\",\"isCache\":\"0\",\"isFrame\":\"1\",\"menuId\":2015,\"menuName\":\"科目类别\",\"menuType\":\"C\",\"orderNum\":1,\"params\":{},\"parentId\":2014,\"path\":\"subjectType\",\"perms\":\"finance:subjectType:list\",\"status\":\"0\",\"updateBy\":\"admin\",\"visible\":\"0\"}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-11-17 11:59:37');
+INSERT INTO `sys_oper_log` VALUES (177, '菜单管理', 2, 'com.ruoyi.web.controller.system.SysMenuController.edit()', 'PUT', 1, 'admin', NULL, '/system/menu', '127.0.0.1', '内网IP', '{\"children\":[],\"component\":\"finance/subjectype/index\",\"createTime\":\"2022-11-17 11:56:57\",\"icon\":\"#\",\"isCache\":\"0\",\"isFrame\":\"1\",\"menuId\":2015,\"menuName\":\"科目类别\",\"menuType\":\"C\",\"orderNum\":1,\"params\":{},\"parentId\":2014,\"path\":\"subjectType\",\"perms\":\"finance:subjectType:list\",\"status\":\"0\",\"updateBy\":\"admin\",\"visible\":\"0\"}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-11-17 12:00:27');
+INSERT INTO `sys_oper_log` VALUES (178, '菜单管理', 2, 'com.ruoyi.web.controller.system.SysMenuController.edit()', 'PUT', 1, 'admin', NULL, '/system/menu', '127.0.0.1', '内网IP', '{\"children\":[],\"component\":\"finance/subjectype/index\",\"createTime\":\"2022-11-17 11:56:57\",\"icon\":\"#\",\"isCache\":\"0\",\"isFrame\":\"1\",\"menuId\":2015,\"menuName\":\"科目类别\",\"menuType\":\"C\",\"orderNum\":1,\"params\":{},\"parentId\":2014,\"path\":\"subjecttype\",\"perms\":\"finance:subjectType:list\",\"status\":\"0\",\"updateBy\":\"admin\",\"visible\":\"0\"}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-11-17 12:01:27');
+INSERT INTO `sys_oper_log` VALUES (179, '菜单管理', 2, 'com.ruoyi.web.controller.system.SysMenuController.edit()', 'PUT', 1, 'admin', NULL, '/system/menu', '127.0.0.1', '内网IP', '{\"children\":[],\"createTime\":\"2022-11-17 09:31:02\",\"icon\":\"job\",\"isCache\":\"0\",\"isFrame\":\"1\",\"menuId\":2014,\"menuName\":\"记账科目管理\",\"menuType\":\"M\",\"orderNum\":2,\"params\":{},\"parentId\":2000,\"path\":\"subject\",\"perms\":\"\",\"status\":\"0\",\"updateBy\":\"admin\",\"visible\":\"0\"}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-11-17 12:02:38');
+INSERT INTO `sys_oper_log` VALUES (180, '菜单管理', 2, 'com.ruoyi.web.controller.system.SysMenuController.edit()', 'PUT', 1, 'admin', NULL, '/system/menu', '127.0.0.1', '内网IP', '{\"children\":[],\"component\":\"finance/subjecttype/index\",\"createTime\":\"2022-11-17 11:56:57\",\"icon\":\"#\",\"isCache\":\"0\",\"isFrame\":\"1\",\"menuId\":2015,\"menuName\":\"科目类别\",\"menuType\":\"C\",\"orderNum\":1,\"params\":{},\"parentId\":2014,\"path\":\"subjecttype\",\"perms\":\"finance:subjectType:list\",\"status\":\"0\",\"updateBy\":\"admin\",\"visible\":\"0\"}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-11-17 12:03:17');
+INSERT INTO `sys_oper_log` VALUES (181, '代码生成', 2, 'com.ruoyi.generator.controller.GenController.synchDb()', 'GET', 1, 'admin', NULL, '/tool/gen/synchDb/fnc_subject_type', '127.0.0.1', '内网IP', '{tableName=fnc_subject_type}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-11-17 14:05:37');
+INSERT INTO `sys_oper_log` VALUES (182, '科目类别', 1, 'com.ruoyi.system.controller.FncSubjectTypeController.add()', 'POST', 1, 'admin', NULL, '/finance/subjectType/add', '127.0.0.1', '内网IP', '{\"createBy\":\"admin\",\"createTime\":\"2022-11-17T14:06:27.204+08:00\",\"deleteStatus\":1,\"orderNum\":3,\"params\":{},\"parentId\":0,\"subjectTypeName\":\"3\",\"updateBy\":\"admin\",\"updateTime\":\"2022-11-17T14:06:27.204+08:00\"}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-11-17 14:06:27');
+INSERT INTO `sys_oper_log` VALUES (183, '科目类别', 3, 'com.ruoyi.system.controller.FncSubjectTypeController.remove()', 'GET', 1, 'admin', NULL, '/finance/subjectType/remove/1', '127.0.0.1', '内网IP', '{subjectTypeIds=1}', '{\"msg\":\"操作失败\",\"code\":500}', 0, NULL, '2022-11-17 14:08:20');
+INSERT INTO `sys_oper_log` VALUES (184, '科目类别', 3, 'com.ruoyi.system.controller.FncSubjectTypeController.remove()', 'GET', 1, 'admin', NULL, '/finance/subjectType/remove/1', '127.0.0.1', '内网IP', '{subjectTypeIds=1}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-11-17 14:10:13');
+INSERT INTO `sys_oper_log` VALUES (185, '部门管理', 1, 'com.ruoyi.web.controller.system.SysDeptController.add()', 'POST', 1, 'admin', NULL, '/system/dept', '127.0.0.1', '内网IP', '{\"ancestors\":\"0,100,101,103\",\"children\":[],\"createBy\":\"admin\",\"deptName\":\"test\",\"leader\":\"test\",\"orderNum\":3,\"params\":{},\"parentId\":103,\"phone\":\"\",\"status\":\"0\"}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-11-17 15:04:56');
+INSERT INTO `sys_oper_log` VALUES (186, '科目类别', 1, 'com.ruoyi.web.controller.finance.FncSubjectTypeController.add()', 'POST', 1, 'admin', NULL, '/finance/subjectType/add', '127.0.0.1', '内网IP', '{\"createBy\":\"admin\",\"createTime\":\"2022-11-17T16:49:37.577+08:00\",\"deleteStatus\":1,\"orderNum\":1,\"params\":{},\"parentId\":0,\"subjectTypeId\":2,\"subjectTypeName\":\"1-1\",\"updateBy\":\"admin\",\"updateTime\":\"2022-11-17T16:49:37.577+08:00\"}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-11-17 16:49:37');
+INSERT INTO `sys_oper_log` VALUES (187, '科目类别', 3, 'com.ruoyi.web.controller.finance.FncSubjectTypeController.remove()', 'GET', 1, 'admin', NULL, '/finance/subjectType/remove/2', '127.0.0.1', '内网IP', '{subjectTypeIds=2}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-11-17 17:00:36');
+INSERT INTO `sys_oper_log` VALUES (188, '科目类别', 1, 'com.ruoyi.web.controller.finance.FncSubjectTypeController.add()', 'POST', 1, 'admin', NULL, '/finance/subjectType/add', '127.0.0.1', '内网IP', '{\"createBy\":\"admin\",\"createTime\":\"2022-11-17T17:00:41.1+08:00\",\"deleteStatus\":1,\"orderNum\":3,\"params\":{},\"parentId\":0,\"subjectTypeId\":3,\"subjectTypeName\":\"3\",\"updateBy\":\"admin\",\"updateTime\":\"2022-11-17T17:00:41.1+08:00\"}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-11-17 17:00:41');
+INSERT INTO `sys_oper_log` VALUES (189, '科目类别', 1, 'com.ruoyi.web.controller.finance.FncSubjectTypeController.add()', 'POST', 1, 'admin', NULL, '/finance/subjectType/add', '127.0.0.1', '内网IP', '{\"createBy\":\"admin\",\"createTime\":\"2022-11-17T17:12:03.451+08:00\",\"deleteStatus\":1,\"orderNum\":2,\"params\":{},\"parentId\":0,\"subjectTypeId\":4,\"subjectTypeName\":\"1-2\",\"updateBy\":\"admin\",\"updateTime\":\"2022-11-17T17:12:03.451+08:00\"}', '{\"msg\":\"操作成功\",\"code\":200}', 0, NULL, '2022-11-17 17:12:03');
 
 -- ----------------------------
 -- Table structure for sys_post
@@ -2948,12 +3023,12 @@ CREATE TABLE `sys_post`  (
   `post_sort` int(4) NOT NULL COMMENT '显示顺序',
   `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '状态（0正常 1停用）',
   `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '创建者',
-  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
   `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '更新者',
-  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+  `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
   `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
   PRIMARY KEY (`post_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '岗位信息表' ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '岗位信息表' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of sys_post
@@ -2978,12 +3053,12 @@ CREATE TABLE `sys_role`  (
   `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '角色状态（0正常 1停用）',
   `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）',
   `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '创建者',
-  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
   `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '更新者',
-  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+  `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
   `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
   PRIMARY KEY (`role_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 100 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '角色信息表' ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB AUTO_INCREMENT = 100 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '角色信息表' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of sys_role
@@ -2999,7 +3074,7 @@ CREATE TABLE `sys_role_dept`  (
   `role_id` bigint(20) NOT NULL COMMENT '角色ID',
   `dept_id` bigint(20) NOT NULL COMMENT '部门ID',
   PRIMARY KEY (`role_id`, `dept_id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '角色和部门关联表' ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '角色和部门关联表' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of sys_role_dept
@@ -3016,7 +3091,7 @@ CREATE TABLE `sys_role_menu`  (
   `role_id` bigint(20) NOT NULL COMMENT '角色ID',
   `menu_id` bigint(20) NOT NULL COMMENT '菜单ID',
   PRIMARY KEY (`role_id`, `menu_id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '角色和菜单关联表' ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '角色和菜单关联表' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of sys_role_menu
@@ -3129,19 +3204,19 @@ CREATE TABLE `sys_user`  (
   `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '帐号状态（0正常 1停用）',
   `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）',
   `login_ip` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '最后登录IP',
-  `login_date` datetime NULL DEFAULT NULL COMMENT '最后登录时间',
+  `login_date` datetime(0) NULL DEFAULT NULL COMMENT '最后登录时间',
   `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '创建者',
-  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
   `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '更新者',
-  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+  `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
   `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
   PRIMARY KEY (`user_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 100 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户信息表' ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB AUTO_INCREMENT = 100 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户信息表' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of sys_user
 -- ----------------------------
-INSERT INTO `sys_user` VALUES (1, 103, 'admin', '若依', '00', 'ry@163.com', '15888888888', '1', '/profile/avatar/2022/11/16/blob_20221116131804A001.png', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', '2022-11-16 21:17:07', 'admin', '2022-11-16 09:26:25', '', '2022-11-16 13:17:07', '管理员');
+INSERT INTO `sys_user` VALUES (1, 103, 'admin', '若依', '00', 'ry@163.com', '15888888888', '1', '/profile/avatar/2022/11/16/blob_20221116131804A001.png', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', '2022-11-17 15:57:49', 'admin', '2022-11-16 09:26:25', '', '2022-11-17 15:57:48', '管理员');
 INSERT INTO `sys_user` VALUES (2, 105, 'ry', '若依', '00', 'ry@qq.com', '15666666666', '1', '', '$2a$10$72XZlIXBNHqFzVMZlzMp7etQzpbmlM22MW1VWNw5q..el.zHjYtT6', '0', '0', '127.0.0.1', '2022-11-16 13:30:08', 'admin', '2022-11-16 09:26:25', 'admin', '2022-11-16 13:30:07', '测试员');
 
 -- ----------------------------
@@ -3152,7 +3227,7 @@ CREATE TABLE `sys_user_post`  (
   `user_id` bigint(20) NOT NULL COMMENT '用户ID',
   `post_id` bigint(20) NOT NULL COMMENT '岗位ID',
   PRIMARY KEY (`user_id`, `post_id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户与岗位关联表' ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户与岗位关联表' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of sys_user_post
@@ -3168,7 +3243,7 @@ CREATE TABLE `sys_user_role`  (
   `user_id` bigint(20) NOT NULL COMMENT '用户ID',
   `role_id` bigint(20) NOT NULL COMMENT '角色ID',
   PRIMARY KEY (`user_id`, `role_id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户和角色关联表' ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户和角色关联表' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of sys_user_role