Skip to content

Commit 273d8f6

Browse files
YunaiVYunaiV
committed
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts: # yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/tenant/TenantSaveReqVO.java
2 parents 9252e7b + e792054 commit 273d8f6

File tree

17 files changed

+139
-78
lines changed

17 files changed

+139
-78
lines changed

‎sql/dm/ruoyi-vue-pro-dm8.sql‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4303,7 +4303,7 @@ CREATE TABLE system_tenant
43034303
contact_name varchar(30) NOT NULL,
43044304
contact_mobile varchar(500) DEFAULT NULL NULL,
43054305
status smallint DEFAULT 0 NOT NULL,
4306-
website varchar(256) DEFAULT '' NULL,
4306+
websites varchar(256) DEFAULT '' NULL,
43074307
package_id bigint NOT NULL,
43084308
expire_time datetime NOT NULL,
43094309
account_count int NOT NULL,
@@ -4320,7 +4320,7 @@ COMMENT ON COLUMN system_tenant.contact_user_id IS '联系人的用户编号';
43204320
COMMENT ON COLUMN system_tenant.contact_name IS '联系人';
43214321
COMMENT ON COLUMN system_tenant.contact_mobile IS '联系手机';
43224322
COMMENT ON COLUMN system_tenant.status IS '租户状态（0正常 1停用）';
4323-
COMMENT ON COLUMN system_tenant.website IS '绑定域名';
4323+
COMMENT ON COLUMN system_tenant.websites IS '绑定域名数组';
43244324
COMMENT ON COLUMN system_tenant.package_id IS '租户套餐编号';
43254325
COMMENT ON COLUMN system_tenant.expire_time IS '过期时间';
43264326
COMMENT ON COLUMN system_tenant.account_count IS '账号数量';
@@ -4336,9 +4336,9 @@ COMMENT ON TABLE system_tenant IS '租户表';
43364336
-- ----------------------------
43374337
-- @formatter:off
43384338
SET IDENTITY_INSERT system_tenant ON;
4339-
INSERT INTO system_tenant (id, name, contact_user_id, contact_name, contact_mobile, status, website, package_id, expire_time, account_count, creator, create_time, updater, update_time, deleted) VALUES (1, '芋道源码', NULL, '芋艿', '17321315478', 0, 'www.iocoder.cn', 0, '2099-02-19 17:14:16', 9999, '1', '2021-01-05 17:03:47', '1', '2023-11-06 11:41:41', '0');
4340-
INSERT INTO system_tenant (id, name, contact_user_id, contact_name, contact_mobile, status, website, package_id, expire_time, account_count, creator, create_time, updater, update_time, deleted) VALUES (121, '小租户', 110, '小王2', '15601691300', 0, 'zsxq.iocoder.cn', 111, '2026-07-10 00:00:00', 30, '1', '2022-02-22 00:56:14', '1', '2025-04-03 21:33:01', '0');
4341-
INSERT INTO system_tenant (id, name, contact_user_id, contact_name, contact_mobile, status, website, package_id, expire_time, account_count, creator, create_time, updater, update_time, deleted) VALUES (122, '测试租户', 113, '芋道', '15601691300', 0, 'test.iocoder.cn', 111, '2022-04-29 00:00:00', 50, '1', '2022-03-07 21:37:58', '1', '2024-09-22 12:10:50', '0');
4339+
INSERT INTO system_tenant (id, name, contact_user_id, contact_name, contact_mobile, status, websites, package_id, expire_time, account_count, creator, create_time, updater, update_time, deleted) VALUES (1, '芋道源码', NULL, '芋艿', '17321315478', 0, 'www.iocoder.cn', 0, '2099-02-19 17:14:16', 9999, '1', '2021-01-05 17:03:47', '1', '2023-11-06 11:41:41', '0');
4340+
INSERT INTO system_tenant (id, name, contact_user_id, contact_name, contact_mobile, status, websites, package_id, expire_time, account_count, creator, create_time, updater, update_time, deleted) VALUES (121, '小租户', 110, '小王2', '15601691300', 0, 'zsxq.iocoder.cn', 111, '2026-07-10 00:00:00', 30, '1', '2022-02-22 00:56:14', '1', '2025-04-03 21:33:01', '0');
4341+
INSERT INTO system_tenant (id, name, contact_user_id, contact_name, contact_mobile, status, websites, package_id, expire_time, account_count, creator, create_time, updater, update_time, deleted) VALUES (122, '测试租户', 113, '芋道', '15601691300', 0, 'test.iocoder.cn', 111, '2022-04-29 00:00:00', 50, '1', '2022-03-07 21:37:58', '1', '2024-09-22 12:10:50', '0');
43424342
COMMIT;
43434343
SET IDENTITY_INSERT system_tenant OFF;
43444344
-- @formatter:on

‎sql/kingbase/ruoyi-vue-pro.sql‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4608,7 +4608,7 @@ CREATE TABLE system_tenant
46084608
contact_name varchar(30) NOT NULL,
46094609
contact_mobile varchar(500) NULL DEFAULT NULL,
46104610
status int2 NOT NULL DEFAULT 0,
4611-
website varchar(256) NULL DEFAULT '',
4611+
websites varchar(256) NULL DEFAULT '',
46124612
package_id int8 NOT NULL,
46134613
expire_time timestamp NOT NULL,
46144614
account_count int4 NOT NULL,
@@ -4628,7 +4628,7 @@ COMMENT ON COLUMN system_tenant.contact_user_id IS '联系人的用户编号';
46284628
COMMENT ON COLUMN system_tenant.contact_name IS '联系人';
46294629
COMMENT ON COLUMN system_tenant.contact_mobile IS '联系手机';
46304630
COMMENT ON COLUMN system_tenant.status IS '租户状态（0正常 1停用）';
4631-
COMMENT ON COLUMN system_tenant.website IS '绑定域名';
4631+
COMMENT ON COLUMN system_tenant.websites IS '绑定域名数组';
46324632
COMMENT ON COLUMN system_tenant.package_id IS '租户套餐编号';
46334633
COMMENT ON COLUMN system_tenant.expire_time IS '过期时间';
46344634
COMMENT ON COLUMN system_tenant.account_count IS '账号数量';
@@ -4644,9 +4644,9 @@ COMMENT ON TABLE system_tenant IS '租户表';
46444644
-- ----------------------------
46454645
-- @formatter:off
46464646
BEGIN;
4647-
INSERT INTO system_tenant (id, name, contact_user_id, contact_name, contact_mobile, status, website, package_id, expire_time, account_count, creator, create_time, updater, update_time, deleted) VALUES (1, '芋道源码', NULL, '芋艿', '17321315478', 0, 'www.iocoder.cn', 0, '2099-02-19 17:14:16', 9999, '1', '2021-01-05 17:03:47', '1', '2023-11-06 11:41:41', '0');
4648-
INSERT INTO system_tenant (id, name, contact_user_id, contact_name, contact_mobile, status, website, package_id, expire_time, account_count, creator, create_time, updater, update_time, deleted) VALUES (121, '小租户', 110, '小王2', '15601691300', 0, 'zsxq.iocoder.cn', 111, '2026-07-10 00:00:00', 30, '1', '2022-02-22 00:56:14', '1', '2025-04-03 21:33:01', '0');
4649-
INSERT INTO system_tenant (id, name, contact_user_id, contact_name, contact_mobile, status, website, package_id, expire_time, account_count, creator, create_time, updater, update_time, deleted) VALUES (122, '测试租户', 113, '芋道', '15601691300', 0, 'test.iocoder.cn', 111, '2022-04-29 00:00:00', 50, '1', '2022-03-07 21:37:58', '1', '2024-09-22 12:10:50', '0');
4647+
INSERT INTO system_tenant (id, name, contact_user_id, contact_name, contact_mobile, status, websites, package_id, expire_time, account_count, creator, create_time, updater, update_time, deleted) VALUES (1, '芋道源码', NULL, '芋艿', '17321315478', 0, 'www.iocoder.cn', 0, '2099-02-19 17:14:16', 9999, '1', '2021-01-05 17:03:47', '1', '2023-11-06 11:41:41', '0');
4648+
INSERT INTO system_tenant (id, name, contact_user_id, contact_name, contact_mobile, status, websites, package_id, expire_time, account_count, creator, create_time, updater, update_time, deleted) VALUES (121, '小租户', 110, '小王2', '15601691300', 0, 'zsxq.iocoder.cn', 111, '2026-07-10 00:00:00', 30, '1', '2022-02-22 00:56:14', '1', '2025-04-03 21:33:01', '0');
4649+
INSERT INTO system_tenant (id, name, contact_user_id, contact_name, contact_mobile, status, websites, package_id, expire_time, account_count, creator, create_time, updater, update_time, deleted) VALUES (122, '测试租户', 113, '芋道', '15601691300', 0, 'test.iocoder.cn', 111, '2022-04-29 00:00:00', 50, '1', '2022-03-07 21:37:58', '1', '2024-09-22 12:10:50', '0');
46504650
COMMIT;
46514651
-- @formatter:on
46524652

‎sql/mysql/ruoyi-vue-pro.sql‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3745,7 +3745,7 @@ CREATE TABLE `system_tenant` (
37453745
`contact_name` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '联系人',
37463746
`contact_mobile` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '联系手机',
37473747
`status` tinyint NOT NULL DEFAULT 0 COMMENT '租户状态（0正常 1停用）',
3748-
`website` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '绑定域名',
3748+
`websites` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '绑定域名数组',
37493749
`package_id` bigint NOT NULL COMMENT '租户套餐编号',
37503750
`expire_time` datetime NOT NULL COMMENT '过期时间',
37513751
`account_count` int NOT NULL COMMENT '账号数量',
@@ -3761,9 +3761,9 @@ CREATE TABLE `system_tenant` (
37613761
-- Records of system_tenant
37623762
-- ----------------------------
37633763
BEGIN;
3764-
INSERT INTO `system_tenant` (`id`, `name`, `contact_user_id`, `contact_name`, `contact_mobile`, `status`, `website`, `package_id`, `expire_time`, `account_count`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1, '芋道源码', NULL, '芋艿', '17321315478', 0, 'www.iocoder.cn', 0, '2099-02-19 17:14:16', 9999, '1', '2021-01-05 17:03:47', '1', '2023-11-06 11:41:41', b'0');
3765-
INSERT INTO `system_tenant` (`id`, `name`, `contact_user_id`, `contact_name`, `contact_mobile`, `status`, `website`, `package_id`, `expire_time`, `account_count`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (121, '小租户', 110, '小王2', '15601691300', 0, 'zsxq.iocoder.cn', 111, '2026-07-10 00:00:00', 30, '1', '2022-02-22 00:56:14', '1', '2025-04-03 21:33:01', b'0');
3766-
INSERT INTO `system_tenant` (`id`, `name`, `contact_user_id`, `contact_name`, `contact_mobile`, `status`, `website`, `package_id`, `expire_time`, `account_count`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (122, '测试租户', 113, '芋道', '15601691300', 0, 'test.iocoder.cn', 111, '2022-04-29 00:00:00', 50, '1', '2022-03-07 21:37:58', '1', '2024-09-22 12:10:50', b'0');
3764+
INSERT INTO `system_tenant` (`id`, `name`, `contact_user_id`, `contact_name`, `contact_mobile`, `status`, `websites`, `package_id`, `expire_time`, `account_count`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1, '芋道源码', NULL, '芋艿', '17321315478', 0, 'www.iocoder.cn', 0, '2099-02-19 17:14:16', 9999, '1', '2021-01-05 17:03:47', '1', '2023-11-06 11:41:41', b'0');
3765+
INSERT INTO `system_tenant` (`id`, `name`, `contact_user_id`, `contact_name`, `contact_mobile`, `status`, `websites`, `package_id`, `expire_time`, `account_count`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (121, '小租户', 110, '小王2', '15601691300', 0, 'zsxq.iocoder.cn', 111, '2026-07-10 00:00:00', 30, '1', '2022-02-22 00:56:14', '1', '2025-04-03 21:33:01', b'0');
3766+
INSERT INTO `system_tenant` (`id`, `name`, `contact_user_id`, `contact_name`, `contact_mobile`, `status`, `websites`, `package_id`, `expire_time`, `account_count`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (122, '测试租户', 113, '芋道', '15601691300', 0, 'test.iocoder.cn', 111, '2022-04-29 00:00:00', 50, '1', '2022-03-07 21:37:58', '1', '2024-09-22 12:10:50', b'0');
37673767
COMMIT;
37683768

37693769
-- ----------------------------

‎sql/opengauss/ruoyi-vue-pro.sql‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4608,7 +4608,7 @@ CREATE TABLE system_tenant
46084608
contact_name varchar(30) NOT NULL,
46094609
contact_mobile varchar(500) NULL DEFAULT NULL,
46104610
status int2 NOT NULL DEFAULT 0,
4611-
website varchar(256) NULL DEFAULT '',
4611+
websites varchar(256) NULL DEFAULT '',
46124612
package_id int8 NOT NULL,
46134613
expire_time timestamp NOT NULL,
46144614
account_count int4 NOT NULL,
@@ -4628,7 +4628,7 @@ COMMENT ON COLUMN system_tenant.contact_user_id IS '联系人的用户编号';
46284628
COMMENT ON COLUMN system_tenant.contact_name IS '联系人';
46294629
COMMENT ON COLUMN system_tenant.contact_mobile IS '联系手机';
46304630
COMMENT ON COLUMN system_tenant.status IS '租户状态（0正常 1停用）';
4631-
COMMENT ON COLUMN system_tenant.website IS '绑定域名';
4631+
COMMENT ON COLUMN system_tenant.websites IS '绑定域名数组';
46324632
COMMENT ON COLUMN system_tenant.package_id IS '租户套餐编号';
46334633
COMMENT ON COLUMN system_tenant.expire_time IS '过期时间';
46344634
COMMENT ON COLUMN system_tenant.account_count IS '账号数量';
@@ -4644,9 +4644,9 @@ COMMENT ON TABLE system_tenant IS '租户表';
46444644
-- ----------------------------
46454645
-- @formatter:off
46464646
BEGIN;
4647-
INSERT INTO system_tenant (id, name, contact_user_id, contact_name, contact_mobile, status, website, package_id, expire_time, account_count, creator, create_time, updater, update_time, deleted) VALUES (1, '芋道源码', NULL, '芋艿', '17321315478', 0, 'www.iocoder.cn', 0, '2099-02-19 17:14:16', 9999, '1', '2021-01-05 17:03:47', '1', '2023-11-06 11:41:41', '0');
4648-
INSERT INTO system_tenant (id, name, contact_user_id, contact_name, contact_mobile, status, website, package_id, expire_time, account_count, creator, create_time, updater, update_time, deleted) VALUES (121, '小租户', 110, '小王2', '15601691300', 0, 'zsxq.iocoder.cn', 111, '2026-07-10 00:00:00', 30, '1', '2022-02-22 00:56:14', '1', '2025-04-03 21:33:01', '0');
4649-
INSERT INTO system_tenant (id, name, contact_user_id, contact_name, contact_mobile, status, website, package_id, expire_time, account_count, creator, create_time, updater, update_time, deleted) VALUES (122, '测试租户', 113, '芋道', '15601691300', 0, 'test.iocoder.cn', 111, '2022-04-29 00:00:00', 50, '1', '2022-03-07 21:37:58', '1', '2024-09-22 12:10:50', '0');
4647+
INSERT INTO system_tenant (id, name, contact_user_id, contact_name, contact_mobile, status, websites, package_id, expire_time, account_count, creator, create_time, updater, update_time, deleted) VALUES (1, '芋道源码', NULL, '芋艿', '17321315478', 0, 'www.iocoder.cn', 0, '2099-02-19 17:14:16', 9999, '1', '2021-01-05 17:03:47', '1', '2023-11-06 11:41:41', '0');
4648+
INSERT INTO system_tenant (id, name, contact_user_id, contact_name, contact_mobile, status, websites, package_id, expire_time, account_count, creator, create_time, updater, update_time, deleted) VALUES (121, '小租户', 110, '小王2', '15601691300', 0, 'zsxq.iocoder.cn', 111, '2026-07-10 00:00:00', 30, '1', '2022-02-22 00:56:14', '1', '2025-04-03 21:33:01', '0');
4649+
INSERT INTO system_tenant (id, name, contact_user_id, contact_name, contact_mobile, status, websites, package_id, expire_time, account_count, creator, create_time, updater, update_time, deleted) VALUES (122, '测试租户', 113, '芋道', '15601691300', 0, 'test.iocoder.cn', 111, '2022-04-29 00:00:00', 50, '1', '2022-03-07 21:37:58', '1', '2024-09-22 12:10:50', '0');
46504650
COMMIT;
46514651
-- @formatter:on
46524652

‎sql/oracle/ruoyi-vue-pro.sql‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4495,7 +4495,7 @@ CREATE TABLE system_tenant
44954495
contact_name varchar2(30) NULL,
44964496
contact_mobile varchar2(500) DEFAULT NULL NULL,
44974497
status smallint DEFAULT 0 NOT NULL,
4498-
website varchar2(256) DEFAULT '' NULL,
4498+
websites varchar2(256) DEFAULT '' NULL,
44994499
package_id number NOT NULL,
45004500
expire_time date NOT NULL,
45014501
account_count number NOT NULL,
@@ -4515,7 +4515,7 @@ COMMENT ON COLUMN system_tenant.contact_user_id IS '联系人的用户编号';
45154515
COMMENT ON COLUMN system_tenant.contact_name IS '联系人';
45164516
COMMENT ON COLUMN system_tenant.contact_mobile IS '联系手机';
45174517
COMMENT ON COLUMN system_tenant.status IS '租户状态（0正常 1停用）';
4518-
COMMENT ON COLUMN system_tenant.website IS '绑定域名';
4518+
COMMENT ON COLUMN system_tenant.websites IS '绑定域名数组';
45194519
COMMENT ON COLUMN system_tenant.package_id IS '租户套餐编号';
45204520
COMMENT ON COLUMN system_tenant.expire_time IS '过期时间';
45214521
COMMENT ON COLUMN system_tenant.account_count IS '账号数量';
@@ -4530,9 +4530,9 @@ COMMENT ON TABLE system_tenant IS '租户表';
45304530
-- Records of system_tenant
45314531
-- ----------------------------
45324532
-- @formatter:off
4533-
INSERT INTO system_tenant (id, name, contact_user_id, contact_name, contact_mobile, status, website, package_id, expire_time, account_count, creator, create_time, updater, update_time, deleted) VALUES (1, '芋道源码', NULL, '芋艿', '17321315478', 0, 'www.iocoder.cn', 0, to_date('2099-02-19 17:14:16', 'SYYYY-MM-DD HH24:MI:SS'), 9999, '1', to_date('2021-01-05 17:03:47', 'SYYYY-MM-DD HH24:MI:SS'), '1', to_date('2023-11-06 11:41:41', 'SYYYY-MM-DD HH24:MI:SS'), '0');
4534-
INSERT INTO system_tenant (id, name, contact_user_id, contact_name, contact_mobile, status, website, package_id, expire_time, account_count, creator, create_time, updater, update_time, deleted) VALUES (121, '小租户', 110, '小王2', '15601691300', 0, 'zsxq.iocoder.cn', 111, to_date('2026-07-10 00:00:00', 'SYYYY-MM-DD HH24:MI:SS'), 30, '1', to_date('2022-02-22 00:56:14', 'SYYYY-MM-DD HH24:MI:SS'), '1', to_date('2025-04-03 21:33:01', 'SYYYY-MM-DD HH24:MI:SS'), '0');
4535-
INSERT INTO system_tenant (id, name, contact_user_id, contact_name, contact_mobile, status, website, package_id, expire_time, account_count, creator, create_time, updater, update_time, deleted) VALUES (122, '测试租户', 113, '芋道', '15601691300', 0, 'test.iocoder.cn', 111, to_date('2022-04-29 00:00:00', 'SYYYY-MM-DD HH24:MI:SS'), 50, '1', to_date('2022-03-07 21:37:58', 'SYYYY-MM-DD HH24:MI:SS'), '1', to_date('2024-09-22 12:10:50', 'SYYYY-MM-DD HH24:MI:SS'), '0');
4533+
INSERT INTO system_tenant (id, name, contact_user_id, contact_name, contact_mobile, status, websites, package_id, expire_time, account_count, creator, create_time, updater, update_time, deleted) VALUES (1, '芋道源码', NULL, '芋艿', '17321315478', 0, 'www.iocoder.cn', 0, to_date('2099-02-19 17:14:16', 'SYYYY-MM-DD HH24:MI:SS'), 9999, '1', to_date('2021-01-05 17:03:47', 'SYYYY-MM-DD HH24:MI:SS'), '1', to_date('2023-11-06 11:41:41', 'SYYYY-MM-DD HH24:MI:SS'), '0');
4534+
INSERT INTO system_tenant (id, name, contact_user_id, contact_name, contact_mobile, status, websites, package_id, expire_time, account_count, creator, create_time, updater, update_time, deleted) VALUES (121, '小租户', 110, '小王2', '15601691300', 0, 'zsxq.iocoder.cn', 111, to_date('2026-07-10 00:00:00', 'SYYYY-MM-DD HH24:MI:SS'), 30, '1', to_date('2022-02-22 00:56:14', 'SYYYY-MM-DD HH24:MI:SS'), '1', to_date('2025-04-03 21:33:01', 'SYYYY-MM-DD HH24:MI:SS'), '0');
4535+
INSERT INTO system_tenant (id, name, contact_user_id, contact_name, contact_mobile, status, websites, package_id, expire_time, account_count, creator, create_time, updater, update_time, deleted) VALUES (122, '测试租户', 113, '芋道', '15601691300', 0, 'test.iocoder.cn', 111, to_date('2022-04-29 00:00:00', 'SYYYY-MM-DD HH24:MI:SS'), 50, '1', to_date('2022-03-07 21:37:58', 'SYYYY-MM-DD HH24:MI:SS'), '1', to_date('2024-09-22 12:10:50', 'SYYYY-MM-DD HH24:MI:SS'), '0');
45364536
COMMIT;
45374537
-- @formatter:on
45384538

0 commit comments

Comments
 (0)