merge master change

2021-10-23 19:16:00 +08:00
parent ee8dcd0888 d194e14780
commit 436781507e
328 changed files with 7300 additions and 2693 deletions
--- a/yudao-admin-ui/src/utils/dict.js
+++ b/yudao-admin-ui/src/utils/dict.js
@@ -15,6 +15,7 @@ export const DICT_TYPE = {
  SYS_USER_SEX: 'sys_user_sex',
  SYS_NOTICE_TYPE: 'sys_notice_type',
  SYS_OPERATE_TYPE: 'sys_operate_type',
+  SYS_LOGIN_TYPE: 'sys_login_type',
  SYS_LOGIN_RESULT: 'sys_login_result',
  SYS_CONFIG_TYPE: 'sys_config_type',
  SYS_SMS_CHANNEL_CODE: 'sys_sms_channel_code',