From acaa220a70020127fe77971e21830bcf1e565b4a Mon Sep 17 00:00:00 2001 From: good <13.qq.com> Date: Sat, 11 May 2024 09:54:10 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E6=AD=A3=20=E4=B8=BB=E5=BB=BA?= =?UTF-8?q?=E9=94=99=E5=88=AB=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/dromara/system/domain/SysOssConfig.java | 2 +- .../java/org/dromara/system/domain/bo/SysOssConfigBo.java | 4 ++-- .../java/org/dromara/system/domain/vo/SysOssConfigVo.java | 2 +- script/sql/oracle/oracle_ry_vue_5.X.sql | 4 ++-- script/sql/postgres/postgres_ry_vue_5.X.sql | 4 ++-- script/sql/ry_vue_5.X.sql | 2 +- script/sql/sqlserver/sqlserver_ry_vue_5.X.sql | 4 ++-- script/sql/update/oracle/update_5.0-5.1.sql | 2 +- script/sql/update/postgres/update_5.0-5.1.sql | 2 +- script/sql/update/sqlserver/update_5.0-5.1.sql | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssConfig.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssConfig.java index 8a9e25e08..4b67d63ea 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssConfig.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssConfig.java @@ -17,7 +17,7 @@ import org.dromara.common.mybatis.core.domain.BaseEntity; public class SysOssConfig extends BaseEntity { /** - * 主建 + * 主键 */ @TableId(value = "oss_config_id") private Long ossConfigId; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssConfigBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssConfigBo.java index 5887ded89..3dc4328c0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssConfigBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssConfigBo.java @@ -25,9 +25,9 @@ import lombok.EqualsAndHashCode; public class SysOssConfigBo extends BaseEntity { /** - * 主建 + * 主键 */ - @NotNull(message = "主建不能为空", groups = {EditGroup.class}) + @NotNull(message = "主键不能为空", groups = {EditGroup.class}) private Long ossConfigId; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssConfigVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssConfigVo.java index b88ec4090..e7cfde4fe 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssConfigVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssConfigVo.java @@ -25,7 +25,7 @@ public class SysOssConfigVo implements Serializable { private static final long serialVersionUID = 1L; /** - * 主建 + * 主键 */ private Long ossConfigId; diff --git a/script/sql/oracle/oracle_ry_vue_5.X.sql b/script/sql/oracle/oracle_ry_vue_5.X.sql index b7b8fc441..191e66fe6 100644 --- a/script/sql/oracle/oracle_ry_vue_5.X.sql +++ b/script/sql/oracle/oracle_ry_vue_5.X.sql @@ -1186,7 +1186,7 @@ create table sys_oss_config ( alter table sys_oss_config add constraint pk_sys_oss_config primary key (oss_config_id); comment on table sys_oss_config is '对象存储配置表'; -comment on column sys_oss_config.oss_config_id is '主建'; +comment on column sys_oss_config.oss_config_id is '主键'; comment on column sys_oss_config.tenant_id is '租户编码'; comment on column sys_oss_config.config_key is '配置key'; comment on column sys_oss_config.access_key is 'accesskey'; @@ -1237,7 +1237,7 @@ create table sys_client ( alter table sys_client add constraint pk_sys_client primary key (id); comment on table sys_client is '系统授权表'; -comment on column sys_client.id is '主建'; +comment on column sys_client.id is '主键'; comment on column sys_client.client_id is '客户端id'; comment on column sys_client.client_key is '客户端key'; comment on column sys_client.client_secret is '客户端秘钥'; diff --git a/script/sql/postgres/postgres_ry_vue_5.X.sql b/script/sql/postgres/postgres_ry_vue_5.X.sql index 2e92d4621..3160711c7 100644 --- a/script/sql/postgres/postgres_ry_vue_5.X.sql +++ b/script/sql/postgres/postgres_ry_vue_5.X.sql @@ -1188,7 +1188,7 @@ create table if not exists sys_oss_config ); comment on table sys_oss_config is '对象存储配置表'; -comment on column sys_oss_config.oss_config_id is '主建'; +comment on column sys_oss_config.oss_config_id is '主键'; comment on column sys_oss_config.tenant_id is '租户编码'; comment on column sys_oss_config.config_key is '配置key'; comment on column sys_oss_config.access_key is 'accessKey'; @@ -1238,7 +1238,7 @@ create table sys_client ( ); comment on table sys_client is '系统授权表'; -comment on column sys_client.id is '主建'; +comment on column sys_client.id is '主键'; comment on column sys_client.client_id is '客户端id'; comment on column sys_client.client_key is '客户端key'; comment on column sys_client.client_secret is '客户端秘钥'; diff --git a/script/sql/ry_vue_5.X.sql b/script/sql/ry_vue_5.X.sql index 618b6c7e2..d4b7c869b 100644 --- a/script/sql/ry_vue_5.X.sql +++ b/script/sql/ry_vue_5.X.sql @@ -817,7 +817,7 @@ create table sys_oss ( -- OSS对象存储动态配置表 -- ---------------------------- create table sys_oss_config ( - oss_config_id bigint(20) not null comment '主建', + oss_config_id bigint(20) not null comment '主键', tenant_id varchar(20) default '000000'comment '租户编号', config_key varchar(20) not null default '' comment '配置key', access_key varchar(255) default '' comment 'accessKey', diff --git a/script/sql/sqlserver/sqlserver_ry_vue_5.X.sql b/script/sql/sqlserver/sqlserver_ry_vue_5.X.sql index 16f075366..6401f9581 100644 --- a/script/sql/sqlserver/sqlserver_ry_vue_5.X.sql +++ b/script/sql/sqlserver/sqlserver_ry_vue_5.X.sql @@ -2988,7 +2988,7 @@ ON [PRIMARY] GO EXEC sp_addextendedproperty - 'MS_Description', N'主建', + 'MS_Description', N'主键', 'SCHEMA', N'dbo', 'TABLE', N'sys_oss_config', 'COLUMN', N'oss_config_id' @@ -3150,7 +3150,7 @@ ON [PRIMARY] GO EXEC sp_addextendedproperty - 'MS_Description', N'主建', + 'MS_Description', N'主键', 'SCHEMA', N'dbo', 'TABLE', N'sys_client', 'COLUMN', N'id' diff --git a/script/sql/update/oracle/update_5.0-5.1.sql b/script/sql/update/oracle/update_5.0-5.1.sql index 363d4abab..09cfae825 100644 --- a/script/sql/update/oracle/update_5.0-5.1.sql +++ b/script/sql/update/oracle/update_5.0-5.1.sql @@ -98,7 +98,7 @@ create table sys_client ( alter table sys_client add constraint pk_sys_client primary key (id); comment on table sys_client is '系统授权表'; -comment on column sys_client.id is '主建'; +comment on column sys_client.id is '主键'; comment on column sys_client.client_id is '客户端id'; comment on column sys_client.client_key is '客户端key'; comment on column sys_client.client_secret is '客户端秘钥'; diff --git a/script/sql/update/postgres/update_5.0-5.1.sql b/script/sql/update/postgres/update_5.0-5.1.sql index fa2eb3e72..f5f0a5c7a 100644 --- a/script/sql/update/postgres/update_5.0-5.1.sql +++ b/script/sql/update/postgres/update_5.0-5.1.sql @@ -97,7 +97,7 @@ create table sys_client ( ); comment on table sys_client is '系统授权表'; -comment on column sys_client.id is '主建'; +comment on column sys_client.id is '主键'; comment on column sys_client.client_id is '客户端id'; comment on column sys_client.client_key is '客户端key'; comment on column sys_client.client_secret is '客户端秘钥'; diff --git a/script/sql/update/sqlserver/update_5.0-5.1.sql b/script/sql/update/sqlserver/update_5.0-5.1.sql index 605f02ff8..bde3813ac 100644 --- a/script/sql/update/sqlserver/update_5.0-5.1.sql +++ b/script/sql/update/sqlserver/update_5.0-5.1.sql @@ -250,7 +250,7 @@ ON [PRIMARY] GO EXEC sp_addextendedproperty -'MS_Description', N'主建', +'MS_Description', N'主键', 'SCHEMA', N'dbo', 'TABLE', N'sys_client', 'COLUMN', N'id'