diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
index 76171899c..0bd004882 100644
--- a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
+++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
@@ -279,7 +279,7 @@ var table = {
title: "信息内容",
area: ['400px', ''],
shadeClose: true,
- btn: ['确认'],
+ btn: ['关闭'],
btnclass: ['btn btn-primary'],
});
}
@@ -775,7 +775,7 @@ var table = {
top.layer.alert(content, {
icon: $.modal.icon(type),
title: "系统提示",
- btn: ['确认'],
+ btn: ['关闭'],
btnclass: ['btn btn-primary'],
});
},
diff --git a/ruoyi-admin/src/main/resources/templates/main.html b/ruoyi-admin/src/main/resources/templates/main.html
index b54b71dc4..0641eb4d2 100644
--- a/ruoyi-admin/src/main/resources/templates/main.html
+++ b/ruoyi-admin/src/main/resources/templates/main.html
@@ -828,7 +828,7 @@
修复更新表格插件后无法设置实例配置问题
修复更新表格插件后导致的主子表错误
修复页面存在多表格,回调函数res数据不正确问题
- 强退&过期清理登录帐号缓存会话
+ 强退&过期清理登录账号缓存会话
表格树标题内容支持html语义化标签
修复配置应用的访问路径首页页签重复问题
优化openTab打开时滚动到当前页签
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index f189d4692..c97628083 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -68,8 +68,8 @@ public class SysUser extends BaseEntity
/** 盐加密 */
private String salt;
- /** 帐号状态(0正常 1停用) */
- @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
+ /** 账号状态(0正常 1停用) */
+ @Excel(name = "账号状态", readConverterExp = "0=正常,1=停用")
private String status;
/** 删除标志(0代表存在 2代表删除) */
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/web/filter/kickout/KickoutSessionFilter.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/web/filter/kickout/KickoutSessionFilter.java
index 3938b0f1b..cecafc282 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/web/filter/kickout/KickoutSessionFilter.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/web/filter/kickout/KickoutSessionFilter.java
@@ -24,7 +24,7 @@ import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.ShiroUtils;
/**
- * 登录帐号控制过滤器
+ * 登录账号控制过滤器
*
* @author ruoyi
*/
diff --git a/sql/ruoyi.html b/sql/ruoyi.html
index 915fa1fbc..d22b68d39 100644
--- a/sql/ruoyi.html
+++ b/sql/ruoyi.html
@@ -985,7 +985,7 @@ char(1) default 'N'
类型:Y默认用户,N非默认用户
c statusstatus
int default 0
-帐号状态:0正常,1禁用
+账号状态:0正常,1禁用
# refuse_desrefuse_des
varchar(500) default ''
拒绝登录描述
@@ -2721,7 +2721,7 @@ varchar(1)
|
status |
int DEFAULT 0 |
- 帐号状态:0正常,1禁用 |
+ 账号状态:0正常,1禁用 |
|
diff --git a/sql/ruoyi.pdm b/sql/ruoyi.pdm
index 9dbddc69d..88f28bf38 100644
--- a/sql/ruoyi.pdm
+++ b/sql/ruoyi.pdm
@@ -2430,7 +2430,7 @@ LABL 0 新宋体,8,N
Administrator
1538297540
admin
-帐号状态:0正常,1禁用
+账号状态:0正常,1禁用
0
char(1)
1
diff --git a/sql/ry_20240601.sql b/sql/ry_20250416.sql
similarity index 99%
rename from sql/ry_20240601.sql
rename to sql/ry_20250416.sql
index 166b5a9f3..e7af8db80 100644
--- a/sql/ry_20240601.sql
+++ b/sql/ry_20250416.sql
@@ -51,7 +51,7 @@ create table sys_user (
avatar varchar(100) default '' comment '头像路径',
password varchar(50) default '' comment '密码',
salt varchar(20) default '' comment '盐加密',
- status char(1) default '0' comment '帐号状态(0正常 1停用)',
+ status char(1) default '0' comment '账号状态(0正常 1停用)',
del_flag char(1) default '0' comment '删除标志(0代表存在 2代表删除)',
login_ip varchar(128) default '' comment '最后登录IP',
login_date datetime comment '最后登录时间',