From f1208474f771a1c233d7425c8ed13fbaa0d521ac Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期三, 12 三月 2025 09:35:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/5.X' into 5.X
---
script/sql/oracle/oracle_ry_vue_5.X.sql | 49 ++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 38 insertions(+), 11 deletions(-)
diff --git a/script/sql/oracle/oracle_ry_vue_5.X.sql b/script/sql/oracle/oracle_ry_vue_5.X.sql
index 0aed89d..94024c9 100644
--- a/script/sql/oracle/oracle_ry_vue_5.X.sql
+++ b/script/sql/oracle/oracle_ry_vue_5.X.sql
@@ -5,7 +5,7 @@
(
id number(20) not null,
user_id number(20) not null,
- tenant_id varchar2(20) default null,
+ tenant_id varchar2(20) default '000000',
auth_id varchar2(255) not null,
source varchar2(255) not null,
open_id varchar2(255) default null,
@@ -65,7 +65,7 @@
comment on column sys_social.create_time is '鍒涘缓鏃堕棿';
comment on column sys_social.update_by is '鏇存柊鑰�';
comment on column sys_social.update_time is '鏇存柊鏃堕棿';
-comment on column sys_social.del_flag is '鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�';
+comment on column sys_social.del_flag is '鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 1浠ｈ〃鍒犻櫎锛�';
-- ----------------------------
-- 绉熸埛琛�
@@ -108,7 +108,7 @@
comment on column sys_tenant.expire_time is '杩囨湡鏃堕棿';
comment on column sys_tenant.account_count is '鐢ㄦ埛鏁伴噺锛�-1涓嶉檺鍒讹級';
comment on column sys_tenant.status is '绉熸埛鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�';
-comment on column sys_tenant.del_flag is '鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�';
+comment on column sys_tenant.del_flag is '鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 1浠ｈ〃鍒犻櫎锛�';
comment on column sys_tenant.create_dept is '鍒涘缓閮ㄩ棬';
comment on column sys_tenant.create_by is '鍒涘缓鑰�';
comment on column sys_tenant.create_time is '鍒涘缓鏃堕棿';
@@ -148,7 +148,7 @@
comment on column sys_tenant_package.menu_ids is '鍏宠仈鑿滃崟id';
comment on column sys_tenant_package.remark is '澶囨敞';
comment on column sys_tenant_package.status is '鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�';
-comment on column sys_tenant_package.del_flag is '鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�';
+comment on column sys_tenant_package.del_flag is '鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 1浠ｈ〃鍒犻櫎锛�';
comment on column sys_tenant_package.create_dept is '鍒涘缓閮ㄩ棬';
comment on column sys_tenant_package.create_by is '鍒涘缓鑰�';
comment on column sys_tenant_package.create_time is '鍒涘缓鏃堕棿';
@@ -193,7 +193,7 @@
comment on column sys_dept.phone is '鑱旂郴鐢佃瘽';
comment on column sys_dept.email is '閭';
comment on column sys_dept.status is '閮ㄩ棬鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�';
-comment on column sys_dept.del_flag is '鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�';
+comment on column sys_dept.del_flag is '鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 1浠ｈ〃鍒犻櫎锛�';
comment on column sys_dept.create_dept is '鍒涘缓閮ㄩ棬';
comment on column sys_dept.create_by is '鍒涘缓鑰�';
comment on column sys_dept.create_time is '鍒涘缓鏃堕棿';
@@ -258,7 +258,7 @@
comment on column sys_user.avatar is '澶村儚璺緞';
comment on column sys_user.password is '瀵嗙爜';
comment on column sys_user.status is '甯愬彿鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�';
-comment on column sys_user.del_flag is '鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�';
+comment on column sys_user.del_flag is '鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 1浠ｈ〃鍒犻櫎锛�';
comment on column sys_user.login_ip is '鏈�鍚庣櫥褰旾P';
comment on column sys_user.login_date is '鏈�鍚庣櫥褰曟椂闂�';
comment on column sys_user.create_dept is '鍒涘缓閮ㄩ棬';
@@ -356,7 +356,7 @@
comment on column sys_role.menu_check_strictly is '鑿滃崟鏍戦�夋嫨椤规槸鍚﹀叧鑱旀樉绀�';
comment on column sys_role.dept_check_strictly is '閮ㄩ棬鏍戦�夋嫨椤规槸鍚﹀叧鑱旀樉绀�';
comment on column sys_role.status is '瑙掕壊鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�';
-comment on column sys_role.del_flag is '鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�';
+comment on column sys_role.del_flag is '鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 1浠ｈ〃鍒犻櫎锛�';
comment on column sys_role.create_dept is '鍒涘缓閮ㄩ棬';
comment on column sys_role.create_by is '鍒涘缓鑰�';
comment on column sys_role.create_time is '鍒涘缓鏃堕棿';
@@ -615,6 +615,8 @@
insert into sys_role_menu values ('3', '106');
insert into sys_role_menu values ('3', '107');
insert into sys_role_menu values ('3', '108');
+insert into sys_role_menu values ('3', '118');
+insert into sys_role_menu values ('3', '123');
insert into sys_role_menu values ('3', '500');
insert into sys_role_menu values ('3', '501');
insert into sys_role_menu values ('3', '1001');
@@ -662,6 +664,12 @@
insert into sys_role_menu values ('3', '1043');
insert into sys_role_menu values ('3', '1044');
insert into sys_role_menu values ('3', '1045');
+insert into sys_role_menu values ('3', '1050');
+insert into sys_role_menu values ('3', '1061');
+insert into sys_role_menu values ('3', '1062');
+insert into sys_role_menu values ('3', '1063');
+insert into sys_role_menu values ('3', '1064');
+insert into sys_role_menu values ('3', '1065');
insert into sys_role_menu values ('3', '1500');
insert into sys_role_menu values ('3', '1501');
insert into sys_role_menu values ('3', '1502');
@@ -674,6 +682,25 @@
insert into sys_role_menu values ('3', '1509');
insert into sys_role_menu values ('3', '1510');
insert into sys_role_menu values ('3', '1511');
+insert into sys_role_menu values ('3', '1600');
+insert into sys_role_menu values ('3', '1601');
+insert into sys_role_menu values ('3', '1602');
+insert into sys_role_menu values ('3', '1603');
+insert into sys_role_menu values ('3', '1620');
+insert into sys_role_menu values ('3', '1621');
+insert into sys_role_menu values ('3', '1622');
+insert into sys_role_menu values ('3', '1623');
+insert into sys_role_menu values ('3', '11618');
+insert into sys_role_menu values ('3', '11619');
+insert into sys_role_menu values ('3', '11629');
+insert into sys_role_menu values ('3', '11632');
+insert into sys_role_menu values ('3', '11633');
+insert into sys_role_menu values ('3', '11638');
+insert into sys_role_menu values ('3', '11639');
+insert into sys_role_menu values ('3', '11640');
+insert into sys_role_menu values ('3', '11641');
+insert into sys_role_menu values ('3', '11642');
+insert into sys_role_menu values ('3', '11643');
insert into sys_role_menu values ('4', '5');
insert into sys_role_menu values ('4', '1500');
insert into sys_role_menu values ('4', '1501');
@@ -738,10 +765,10 @@
oper_url varchar2(255) default '',
oper_ip varchar2(128) default '',
oper_location varchar2(255) default '',
- oper_param varchar2(2100) default '',
- json_result varchar2(2100) default '',
+ oper_param varchar2(4000) default '',
+ json_result varchar2(4000) default '',
status number(1) default 0,
- error_msg varchar2(2100) default '',
+ error_msg varchar2(4000) default '',
oper_time date,
cost_time number(20) default 0
);
@@ -1245,7 +1272,7 @@
comment on column sys_client.active_timeout is 'token娲昏穬瓒呮椂鏃堕棿';
comment on column sys_client.timeout is 'token鍥哄畾瓒呮椂';
comment on column sys_client.status is '鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�';
-comment on column sys_client.del_flag is '鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�';
+comment on column sys_client.del_flag is '鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 1浠ｈ〃鍒犻櫎锛�';
comment on column sys_client.create_dept is '鍒涘缓閮ㄩ棬';
comment on column sys_client.create_by is '鍒涘缓鑰�';
comment on column sys_client.create_time is '鍒涘缓鏃堕棿';
--
Gitblit v1.9.3