From 74e884c3ab579fe6e1a92a8c484d80384fd2ebae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Sat, 11 May 2024 20:20:46 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E9=94=99=E5=88=AB?= =?UTF-8?q?=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/dromara/resource/domain/SysOssConfig.java | 2 +- .../java/org/dromara/resource/domain/bo/SysOssConfigBo.java | 4 ++-- .../java/org/dromara/resource/domain/vo/SysOssConfigVo.java | 2 +- sql/oracle/oracle_ry_cloud.sql | 4 ++-- sql/postgres/postgres_ry_cloud.sql | 4 ++-- sql/ry-cloud.sql | 2 +- sql/update/oracle/update_2.0-2.1.sql | 2 +- sql/update/postgres/update_2.0-2.1.sql | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/SysOssConfig.java b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/SysOssConfig.java index e4fa78aa..53a620c9 100644 --- a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/SysOssConfig.java +++ b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/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-resource/src/main/java/org/dromara/resource/domain/bo/SysOssConfigBo.java b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/bo/SysOssConfigBo.java index c65013ee..2871bf63 100644 --- a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/bo/SysOssConfigBo.java +++ b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/bo/SysOssConfigBo.java @@ -25,9 +25,9 @@ import jakarta.validation.constraints.Size; public class SysOssConfigBo extends BaseEntity { /** - * 主建 + * 主键 */ - @NotNull(message = "主建不能为空", groups = {EditGroup.class}) + @NotNull(message = "主键不能为空", groups = {EditGroup.class}) private Long ossConfigId; /** diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/vo/SysOssConfigVo.java b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/vo/SysOssConfigVo.java index dc4046f3..7d0860a6 100644 --- a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/vo/SysOssConfigVo.java +++ b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/vo/SysOssConfigVo.java @@ -23,7 +23,7 @@ public class SysOssConfigVo implements Serializable { private static final long serialVersionUID = 1L; /** - * 主建 + * 主键 */ private Long ossConfigId; diff --git a/sql/oracle/oracle_ry_cloud.sql b/sql/oracle/oracle_ry_cloud.sql index f7ae9f1d..9503d765 100644 --- a/sql/oracle/oracle_ry_cloud.sql +++ b/sql/oracle/oracle_ry_cloud.sql @@ -1189,7 +1189,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'; @@ -1241,7 +1241,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/sql/postgres/postgres_ry_cloud.sql b/sql/postgres/postgres_ry_cloud.sql index f096e730..d1668007 100644 --- a/sql/postgres/postgres_ry_cloud.sql +++ b/sql/postgres/postgres_ry_cloud.sql @@ -1189,7 +1189,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'; @@ -1240,7 +1240,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/sql/ry-cloud.sql b/sql/ry-cloud.sql index e1509948..cf1f740a 100644 --- a/sql/ry-cloud.sql +++ b/sql/ry-cloud.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/sql/update/oracle/update_2.0-2.1.sql b/sql/update/oracle/update_2.0-2.1.sql index 98fe620d..0fbee5bc 100644 --- a/sql/update/oracle/update_2.0-2.1.sql +++ b/sql/update/oracle/update_2.0-2.1.sql @@ -94,7 +94,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/sql/update/postgres/update_2.0-2.1.sql b/sql/update/postgres/update_2.0-2.1.sql index 93c33f05..1556d8b3 100644 --- a/sql/update/postgres/update_2.0-2.1.sql +++ b/sql/update/postgres/update_2.0-2.1.sql @@ -93,7 +93,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 '客户端秘钥';