Merge remote-tracking branch 'base/pre' into dev

# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-biz-business/src/main/java/cn/iocoder/yudao/framework/business/interceptor/BusinessHeaderInterceptor.java

sql/mysql/patch.sql

@@ -1,3 +1,6 @@
 -- 1. 附件信息表新增上传文件 Hash 字段，如果上传文件 hash 重复直接复用不进行重复上传
 ALTER TABLE infra_file ADD COLUMN hash VARCHAR(64) COMMENT '文件哈希值（SHA-256）';
-CREATE INDEX idx_infra_file_hash ON infra_file(hash);
+CREATE INDEX idx_infra_file_hash ON infra_file(hash);
+
+-- 2. 附件信息表新增 AES 加密时存储的随机 IV 字段
+ALTER TABLE infra_file ADD COLUMN aes_iv VARCHAR(128) NULL COMMENT 'AES加密时的随机IV（Base64编码）';

sql/mysql/ruoyi-vue-pro.sql

@@ -4114,5 +4114,24 @@ CREATE TABLE `system_user_dept`
 -- ----------------------------
 -- Records of system_user_dept
 -- ----------------------------
+-- ----------------------------
+-- Table structure for system_std_nms
+-- ----------------------------
+DROP TABLE IF EXISTS `system_std_nms`;
+CREATE TABLE `system_std_nms`
+(
+    `id`          BIGINT       NOT NULL AUTO_INCREMENT PRIMARY KEY COMMENT '主键ID',
+    `word`        VARCHAR(128) NOT NULL UNIQUE COMMENT '英文',
+    `abbr`        VARCHAR(32)  NOT NULL UNIQUE COMMENT '简写',
+    `info`        VARCHAR(128) NOT NULL UNIQUE COMMENT '中文意思',
+    `creator`     VARCHAR(64)  NOT NULL DEFAULT '' COMMENT '创建者',
+    `create_time` DATETIME     NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `updater`     VARCHAR(64)  NOT NULL DEFAULT '' COMMENT '更新者',
+    `update_time` DATETIME     NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后更新时间',
+    `deleted`     TINYINT(1)   NOT NULL DEFAULT 0 COMMENT '是否删除'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='数据命名与简写标准'
+-- ----------------------------
+-- Records of system_std_nms
+-- ----------------------------
 
 SET FOREIGN_KEY_CHECKS = 1;