Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into pay_extension

 Conflicts:

	sql/ruoyi-vue-pro.sql

	yudao-admin-server/src/main/resources/application.yaml

	yudao-admin-server/src/test/resources/sql/clean.sql

	yudao-admin-server/src/test/resources/sql/create_tables.sql

	yudao-admin-ui/src/utils/dict.js

	yudao-user-server/src/main/resources/application-local.yaml

yudao-admin-ui/src/api/oa/flow.js

@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+
+export function getStartForm(processKey) {
+  return request({
+    url: '/workflow/process/definition/getStartForm?processKey='+processKey,
+    method: 'get'
+  })
+}

yudao-admin-ui/src/api/oa/leave.js

@@ -0,0 +1,62 @@
+import request from '@/utils/request'
+
+// 创建请假申请
+export function createLeave(data) {
+  return request({
+    url: '/oa/leave/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新请假申请
+export function updateLeave(data) {
+  return request({
+    url: '/oa/leave/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除请假申请
+export function deleteLeave(id) {
+  return request({
+    url: '/oa/leave/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得请假申请
+export function getLeave(id) {
+  return request({
+    url: '/oa/leave/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得请假申请分页
+export function getLeavePage(query) {
+  return request({
+    url: '/oa/leave/page',
+    method: 'get',
+    params: query
+  })
+}
+
+export function createFormKeyLeave(data) {
+  return request({
+    url: '/oa/leave/form-key/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 导出请假申请 Excel
+export function exportLeaveExcel(query) {
+  return request({
+    url: '/oa/leave/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

yudao-admin-ui/src/api/oa/todo.js

@@ -0,0 +1,83 @@
+import request from '@/utils/request'
+
+// 创建请假申请
+export function createLeave(data) {
+  return request({
+    url: '/oa/leave/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新请假申请
+export function updateLeave(data) {
+  return request({
+    url: '/oa/leave/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除请假申请
+export function deleteLeave(id) {
+  return request({
+    url: '/oa/leave/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得请假申请
+export function getLeave(id) {
+  return request({
+    url: '/oa/leave/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得待办任务分页
+export function getTodoTaskPage(query) {
+  return request({
+    url: '/workflow/task/todo/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 签收任务
+export function claimTask(id) {
+  return request({
+    url: '/workflow/task/claim?id=' + id,
+    method: 'get'
+  })
+}
+
+export function completeTask(data) {
+  return request({
+    url: '/workflow/task/complete',
+    method: 'post',
+    data: data
+  })
+}
+
+export function taskSteps(data) {
+  return request({
+    url: '/workflow/task/task-steps',
+    method: 'post',
+    data: data
+  })
+}
+
+export function getTaskFormKey(data) {
+  return request({
+    url: '/workflow/task/formKey',
+    method: 'post',
+    data: data
+  })
+}
+
+export function processHistorySteps(id) {
+  return request({
+    url: '/workflow/task/process/history-steps?id='+id,
+    method: 'get'
+  })
+}

yudao-admin-ui/src/api/system/tenant.js

@@ -0,0 +1,65 @@
+import request from '@/utils/request'
+
+// 使用租户名，获得租户编号
+export function getTenantIdByName(name) {
+  return request({
+    url: '/system/tenant/get-id-by-name',
+    method: 'get',
+    params: {
+      name
+    }
+  })
+}
+
+// 创建租户
+export function createTenant(data) {
+  return request({
+    url: '/system/tenant/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新租户
+export function updateTenant(data) {
+  return request({
+    url: '/system/tenant/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除租户
+export function deleteTenant(id) {
+  return request({
+    url: '/system/tenant/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得租户
+export function getTenant(id) {
+  return request({
+    url: '/system/tenant/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得租户分页
+export function getTenantPage(query) {
+  return request({
+    url: '/system/tenant/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出租户 Excel
+export function exportTenantExcel(query) {
+  return request({
+    url: '/system/tenant/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}