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

# Conflicts: # yudao-admin-server/src/test/resources/sql/create_tables.sql
2021-12-21 17:02:15 +08:00
parent d1a20bf259 be0b47ecb7
commit aad85337ce
806 changed files with 64521 additions and 2406 deletions
--- a/yudao-admin-ui/src/utils/dict.js
+++ b/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',
  // 应用状态