Merge remote-tracking branch 'origin/pay_extension' into pay_extension

# Conflicts:
#	yudao-admin-server/src/test/resources/sql/create_tables.sql

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

@@ -31,6 +31,9 @@ export const DICT_TYPE = {
 
   TOOL_CODEGEN_TEMPLATE_TYPE: 'tool_codegen_template_type',
 
+  OA_LEAVE_STATUS: 'oa_leave_status',
+  OA_LEAVE_TYPE: 'oa_leave_type',
+
   // 商户状态
   PAY_MERCHANT_STATUS: 'pay_merchant_status',
   // 应用状态

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

@@ -3,6 +3,7 @@ import { Notification, MessageBox, Message } from 'element-ui'
 import store from '@/store'
 import { getToken } from '@/utils/auth'
 import errorCode from '@/utils/errorCode'
+import Cookies from "js-cookie";
 
 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 // 创建axios实例
@@ -19,6 +20,11 @@ service.interceptors.request.use(config => {
   if (getToken() && !isToken) {
     config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
   }
+  // 设置租户
+  const tenantId = Cookies.get('tenantId');
+  if (tenantId) {
+    config.headers['tenant-id'] = tenantId;
+  }
   // get请求映射params参数
   if (config.method === 'get' && config.params) {
     let url = config.url + '?';