diff --git a/.gitee/ISSUE_TEMPLATE/bug.yml b/.gitee/ISSUE_TEMPLATE/bug.yml
index 2037ad95..3c545efb 100644
--- a/.gitee/ISSUE_TEMPLATE/bug.yml
+++ b/.gitee/ISSUE_TEMPLATE/bug.yml
@@ -7,7 +7,7 @@ body:
         attributes:
             label: 这个 Bug 是否已经存在：
             options:
-                -   label: 我确定已经把 MyBatis-Flex 升级到最新版本 v1.9.7，并已搜索过现有的问题 (https://gitee.com/mybatis-flex/mybatis-flex/issues)
+                -   label: 我确定已经把 MyBatis-Flex 升级到最新版本 v1.9.8，并已搜索过现有的问题 (https://gitee.com/mybatis-flex/mybatis-flex/issues)
                     required: true
     -   type: textarea
         attributes:
diff --git a/changes.md b/changes.md
index c51f0729..f810b8c9 100644
--- a/changes.md
+++ b/changes.md
@@ -2,6 +2,35 @@
 
 查看 [全部代码贡献者](/zh/intro/what-is-mybatisflex.html#贡献者)。
 
+## v1.9.8 20241020
+- 新增：新增 trino 方言，感谢 @chenjh3
+- 新增：新增 OptimisticLockManager，用于处理跳过乐观锁的场景，感谢 @tiankafei
+- 新增：添加 solon 事务支持，感谢 @noear_admin
+- 新增: 增加未匹配列的自定义处理拓展接口，感谢 @something4ArthurW
+- 新增：添加查询列和查询条件相互转换的适配器，感谢 @Suomm
+- 新增：无法顺序读取数据源配置时，可以手动指定默认数据源，感谢 @Suomm
+- 新增：使用实体类构建 QueryWrapper 时，可以使用实体类中属性标记的 TypeHandler 对值进行处理，感谢 @Suomm
+- 新增：代码生成器添加表后缀处理，感谢 @Suomm
+- 优化：mybatis-spring 升级同步升级 mybatis 依赖版本为 3.5.16
+- 优化：废弃使用多个值的 SQL 连接符，感谢 @Suomm
+- 优化：优化 SelectQueryColumn 类，感谢 @Suomm
+- 优化：使 QueryColumn 子类可以自定义 SQL 生成，感谢 @Suomm
+- 优化：优化 CustomKeyGenerator 类，感谢 @Suomm
+- 优化：修正一些拼写错误，感谢 @Suomm
+- 优化：如果更新数据时租户字段有值，则不覆盖，感谢 @Suomm
+- 优化：FlexDefaultResultSetHandler 细节优化
+- 优化：为 ModifyAttrsRecordProxyFactory 添加更加明确的异常信息，感谢 @Suomm
+- 修复：使用 DbChain 的 as 出现 query table must not be empty 异常，感谢 @Suomm
+- 修复：空数组/集合会查出所有数据的问题，感谢 @Suomm
+- 修复：case when 中使用 SelectQueryColumn 字段会变成空的问题，感谢 @Suomm
+- 修复：解决 XML 审计无法打印参数以及审计参数顺序问题，感谢 @Suomm
+- 修复：使用 mapper.xml 的嵌套查询出现 NPE 的问题，感谢 @Suomm
+- 修复：兼容 Lambda 的方式构建 SQL 为表起别名没有应用的问题，感谢 @Suomm
+- 修复：代码生成器实体类有父类不添加 `@EqualsAndHashCode(callSuper = true)` 的问题，感谢 @Suomm
+- 修复：UPDATE JOIN 表没有别名的错误，感谢 @Suomm
+- 修复：修复 `@EnumValue` 应用在接口方法上失效的问题，感谢 @aliothmoon
+
+
 
 ## v1.9.7 20240828
 - 新增：增加 updateBatch 方法是否忽略 null 字段的可配置性，感谢 @wqdTryBest
diff --git a/docs/zh/intro/getting-started.md b/docs/zh/intro/getting-started.md
index 188936ce..3ceee171 100644
--- a/docs/zh/intro/getting-started.md
+++ b/docs/zh/intro/getting-started.md
@@ -53,7 +53,7 @@ VALUES (1, '张三', 18, '2020-01-11'),
     <dependency>
         <groupId>com.mybatis-flex</groupId>
         <artifactId>mybatis-flex-spring-boot-starter</artifactId>
-        <version>1.9.7</version>
+        <version>1.9.8</version>
     </dependency>
     <dependency>
         <groupId>com.mysql</groupId>
@@ -81,7 +81,7 @@ VALUES (1, '张三', 18, '2020-01-11'),
     <dependency>
         <groupId>com.mybatis-flex</groupId>
         <artifactId>mybatis-flex-spring-boot3-starter</artifactId>
-        <version>1.9.7</version>
+        <version>1.9.8</version>
     </dependency>
     <dependency>
         <groupId>com.mysql</groupId>
diff --git a/docs/zh/intro/gradle.md b/docs/zh/intro/gradle.md
index 1ed435f0..a8f3c5ac 100644
--- a/docs/zh/intro/gradle.md
+++ b/docs/zh/intro/gradle.md
@@ -10,7 +10,7 @@
 
 ```kotlin
 dependencies {
-    implementation("com.mybatis-flex:mybatis-flex-core:1.9.7")
+    implementation("com.mybatis-flex:mybatis-flex-core:1.9.8")
 }
 ```
 
@@ -18,7 +18,7 @@ dependencies {
 
 ```groovy
 dependencies {
-    implementation 'com.mybatis-flex:mybatis-flex-core:1.9.7'
+    implementation 'com.mybatis-flex:mybatis-flex-core:1.9.8'
 }
 ```
 
@@ -28,7 +28,7 @@ dependencies {
 
 ```kotlin
 dependencies {
-    implementation("com.mybatis-flex:mybatis-flex-spring:1.9.7")
+    implementation("com.mybatis-flex:mybatis-flex-spring:1.9.8")
 }
 ```
 
@@ -36,7 +36,7 @@ dependencies {
 
 ```groovy
 dependencies {
-    implementation 'com.mybatis-flex:mybatis-flex-spring:1.9.7'
+    implementation 'com.mybatis-flex:mybatis-flex-spring:1.9.8'
 }
 ```
 
@@ -46,7 +46,7 @@ dependencies {
 
 ```kotlin
 dependencies {
-    implementation("com.mybatis-flex:mybatis-flex-spring-boot-starter:1.9.7")
+    implementation("com.mybatis-flex:mybatis-flex-spring-boot-starter:1.9.8")
 }
 ```
 
@@ -54,7 +54,7 @@ dependencies {
 
 ```groovy
 dependencies {
-    implementation 'com.mybatis-flex:mybatis-flex-spring-boot-starter:1.9.7'
+    implementation 'com.mybatis-flex:mybatis-flex-spring-boot-starter:1.9.8'
 }
 ```
 
@@ -70,7 +70,7 @@ dependencies {
 
 ```kotlin
 dependencies {
-    annotationProcessor("com.mybatis-flex:mybatis-flex-processor:1.9.7")
+    annotationProcessor("com.mybatis-flex:mybatis-flex-processor:1.9.8")
 }
 ```
 
@@ -78,6 +78,6 @@ dependencies {
 
 ```groovy
 dependencies {
-    annotationProcessor 'com.mybatis-flex:mybatis-flex-processor:1.9.7'
+    annotationProcessor 'com.mybatis-flex:mybatis-flex-processor:1.9.8'
 }
 ```
diff --git a/docs/zh/intro/maven.md b/docs/zh/intro/maven.md
index af358777..f25904f5 100644
--- a/docs/zh/intro/maven.md
+++ b/docs/zh/intro/maven.md
@@ -12,12 +12,12 @@
 <dependency>
     <groupId>com.mybatis-flex</groupId>
     <artifactId>mybatis-flex-core</artifactId>
-    <version>1.9.7</version>
+    <version>1.9.8</version>
 </dependency>
 <dependency>
     <groupId>com.mybatis-flex</groupId>
     <artifactId>mybatis-flex-processor</artifactId>
-    <version>1.9.7</version>
+    <version>1.9.8</version>
     <scope>provided</scope>
 </dependency>
 ```
@@ -28,12 +28,12 @@
 <dependency>
     <groupId>com.mybatis-flex</groupId>
     <artifactId>mybatis-flex-spring</artifactId>
-    <version>1.9.7</version>
+    <version>1.9.8</version>
 </dependency>
 <dependency>
     <groupId>com.mybatis-flex</groupId>
     <artifactId>mybatis-flex-processor</artifactId>
-    <version>1.9.7</version>
+    <version>1.9.8</version>
     <scope>provided</scope>
 </dependency>
 ``````
@@ -44,12 +44,12 @@
 <dependency>
     <groupId>com.mybatis-flex</groupId>
     <artifactId>mybatis-flex-spring-boot-starter</artifactId>
-    <version>1.9.7</version>
+    <version>1.9.8</version>
 </dependency>
 <dependency>
     <groupId>com.mybatis-flex</groupId>
     <artifactId>mybatis-flex-processor</artifactId>
-    <version>1.9.7</version>
+    <version>1.9.8</version>
     <scope>provided</scope>
 </dependency>
 ```
@@ -60,12 +60,12 @@
 <dependency>
     <groupId>com.mybatis-flex</groupId>
     <artifactId>mybatis-flex-spring-boot3-starter</artifactId>
-    <version>1.9.7</version>
+    <version>1.9.8</version>
 </dependency>
 <dependency>
     <groupId>com.mybatis-flex</groupId>
     <artifactId>mybatis-flex-processor</artifactId>
-    <version>1.9.7</version>
+    <version>1.9.8</version>
     <scope>provided</scope>
 </dependency>
 ```
@@ -88,7 +88,7 @@
             <path>
                 <groupId>com.mybatis-flex</groupId>
                 <artifactId>mybatis-flex-processor</artifactId>
-                <version>1.9.7</version>
+                <version>1.9.8</version>
             </path>
         </annotationProcessorPaths>
     </configuration>
diff --git a/docs/zh/others/apt.md b/docs/zh/others/apt.md
index f8dcb49b..05af2f76 100644
--- a/docs/zh/others/apt.md
+++ b/docs/zh/others/apt.md
@@ -248,7 +248,7 @@ pom.xml 添加 `annotationProcessorPaths` 配置，
 ```
 dependencies {
     ...
-    annotationProcessor 'com.mybatis-flex:mybatis-flex-processor:1.9.7'
+    annotationProcessor 'com.mybatis-flex:mybatis-flex-processor:1.9.8'
 }
 ```
 
diff --git a/docs/zh/others/codegen.md b/docs/zh/others/codegen.md
index 7f78e5f4..25b05fd5 100644
--- a/docs/zh/others/codegen.md
+++ b/docs/zh/others/codegen.md
@@ -21,7 +21,7 @@
 <dependency>
     <groupId>com.mybatis-flex</groupId>
     <artifactId>mybatis-flex-codegen</artifactId>
-    <version>1.9.7</version>
+    <version>1.9.8</version>
 </dependency>
 ```
 
diff --git a/mybatis-flex-annotation/pom.xml b/mybatis-flex-annotation/pom.xml
index 54f232f0..d22bcf83 100644
--- a/mybatis-flex-annotation/pom.xml
+++ b/mybatis-flex-annotation/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.9.7</version>
+        <version>1.9.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/mybatis-flex-codegen/pom.xml b/mybatis-flex-codegen/pom.xml
index c78fe2be..88df78d0 100644
--- a/mybatis-flex-codegen/pom.xml
+++ b/mybatis-flex-codegen/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.9.7</version>
+        <version>1.9.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>com.mybatis-flex</groupId>
             <artifactId>mybatis-flex-core</artifactId>
-            <version>1.9.7</version>
+            <version>1.9.8</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.mybatis-flex</groupId>
diff --git a/mybatis-flex-core/pom.xml b/mybatis-flex-core/pom.xml
index f778b42e..ef987135 100644
--- a/mybatis-flex-core/pom.xml
+++ b/mybatis-flex-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.9.7</version>
+        <version>1.9.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -101,7 +101,7 @@
         <dependency>
             <groupId>com.mybatis-flex</groupId>
             <artifactId>mybatis-flex-annotation</artifactId>
-            <version>1.9.7</version>
+            <version>1.9.8</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/FlexConsts.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/FlexConsts.java
index 51173b73..3612e717 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/FlexConsts.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/FlexConsts.java
@@ -27,7 +27,7 @@ public class FlexConsts {
     }
 
     public static final String NAME = "MyBatis-Flex";
-    public static final String VERSION = "1.9.7";
+    public static final String VERSION = "1.9.8";
 
 
     public static final String SQL = "$$sql";
diff --git a/mybatis-flex-dependencies/pom.xml b/mybatis-flex-dependencies/pom.xml
index 1f3e1af7..127654a3 100644
--- a/mybatis-flex-dependencies/pom.xml
+++ b/mybatis-flex-dependencies/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.mybatis-flex</groupId>
     <artifactId>mybatis-flex-dependencies</artifactId>
-    <version>1.9.7</version>
+    <version>1.9.8</version>
 
     <packaging>pom</packaging>
 
@@ -48,7 +48,7 @@
         </developer>
     </developers>
     <properties>
-        <mybatis-flex.version>1.9.7</mybatis-flex.version>
+        <mybatis-flex.version>1.9.8</mybatis-flex.version>
     </properties>
 
     <dependencyManagement>
diff --git a/mybatis-flex-processor/pom.xml b/mybatis-flex-processor/pom.xml
index 2fb1489a..212fb971 100644
--- a/mybatis-flex-processor/pom.xml
+++ b/mybatis-flex-processor/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.9.7</version>
+        <version>1.9.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>mybatis-flex-processor</artifactId>
     <packaging>jar</packaging>
-    <version>1.9.7</version>
+    <version>1.9.8</version>
 
 
     <properties>
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>com.mybatis-flex</groupId>
             <artifactId>mybatis-flex-annotation</artifactId>
-            <version>1.9.7</version>
+            <version>1.9.8</version>
         </dependency>
     </dependencies>
 
diff --git a/mybatis-flex-solon-plugin/pom.xml b/mybatis-flex-solon-plugin/pom.xml
index 5e436bc1..48d48615 100644
--- a/mybatis-flex-solon-plugin/pom.xml
+++ b/mybatis-flex-solon-plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.9.7</version>
+        <version>1.9.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/mybatis-flex-spring-boot-starter/pom.xml b/mybatis-flex-spring-boot-starter/pom.xml
index 3ed64848..23d00876 100644
--- a/mybatis-flex-spring-boot-starter/pom.xml
+++ b/mybatis-flex-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.9.7</version>
+        <version>1.9.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>com.mybatis-flex</groupId>
             <artifactId>mybatis-flex-spring</artifactId>
-            <version>1.9.7</version>
+            <version>1.9.8</version>
         </dependency>
 
         <dependency>
@@ -104,7 +104,7 @@
         <dependency>
             <groupId>com.mybatis-flex</groupId>
             <artifactId>mybatis-flex-core</artifactId>
-            <version>1.9.7</version>
+            <version>1.9.8</version>
         </dependency>
 
     </dependencies>
diff --git a/mybatis-flex-spring-boot3-starter/pom.xml b/mybatis-flex-spring-boot3-starter/pom.xml
index d05fda76..278ade0b 100644
--- a/mybatis-flex-spring-boot3-starter/pom.xml
+++ b/mybatis-flex-spring-boot3-starter/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.mybatis-flex</groupId>
         <artifactId>parent</artifactId>
-        <version>1.9.7</version>
+        <version>1.9.8</version>
     </parent>
 
     <artifactId>mybatis-flex-spring-boot3-starter</artifactId>
@@ -19,7 +19,7 @@
         <dependency>
             <groupId>com.mybatis-flex</groupId>
             <artifactId>mybatis-flex-spring-boot-starter</artifactId>
-            <version>1.9.7</version>
+            <version>1.9.8</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.mybatis</groupId>
diff --git a/mybatis-flex-spring/pom.xml b/mybatis-flex-spring/pom.xml
index 669ba5f3..3e606e7b 100644
--- a/mybatis-flex-spring/pom.xml
+++ b/mybatis-flex-spring/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.9.7</version>
+        <version>1.9.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>com.mybatis-flex</groupId>
             <artifactId>mybatis-flex-core</artifactId>
-            <version>1.9.7</version>
+            <version>1.9.8</version>
         </dependency>
 
         <dependency>
diff --git a/mybatis-flex-test/mybatis-flex-native-test/pom.xml b/mybatis-flex-test/mybatis-flex-native-test/pom.xml
index 71e62a09..8e8f20f8 100644
--- a/mybatis-flex-test/mybatis-flex-native-test/pom.xml
+++ b/mybatis-flex-test/mybatis-flex-native-test/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mybatis-flex-test</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.9.7</version>
+        <version>1.9.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/mybatis-flex-test/mybatis-flex-seata-test/pom.xml b/mybatis-flex-test/mybatis-flex-seata-test/pom.xml
index b237d9eb..6087664b 100644
--- a/mybatis-flex-test/mybatis-flex-seata-test/pom.xml
+++ b/mybatis-flex-test/mybatis-flex-seata-test/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>mybatis-flex-test</artifactId>
 		<groupId>com.mybatis-flex</groupId>
-		<version>1.9.7</version>
+		<version>1.9.8</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/mybatis-flex-test/mybatis-flex-spring-boot-test/pom.xml b/mybatis-flex-test/mybatis-flex-spring-boot-test/pom.xml
index ab93639c..53c5acaa 100644
--- a/mybatis-flex-test/mybatis-flex-spring-boot-test/pom.xml
+++ b/mybatis-flex-test/mybatis-flex-spring-boot-test/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mybatis-flex-test</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.9.7</version>
+        <version>1.9.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/mybatis-flex-test/mybatis-flex-spring-cloud-test/pom.xml b/mybatis-flex-test/mybatis-flex-spring-cloud-test/pom.xml
index 047d5f8d..485325ac 100644
--- a/mybatis-flex-test/mybatis-flex-spring-cloud-test/pom.xml
+++ b/mybatis-flex-test/mybatis-flex-spring-cloud-test/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mybatis-flex-test</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.9.7</version>
+        <version>1.9.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/mybatis-flex-test/mybatis-flex-spring-test/pom.xml b/mybatis-flex-test/mybatis-flex-spring-test/pom.xml
index a20d95dc..088da8b1 100644
--- a/mybatis-flex-test/mybatis-flex-spring-test/pom.xml
+++ b/mybatis-flex-test/mybatis-flex-spring-test/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mybatis-flex-test</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.9.7</version>
+        <version>1.9.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/mybatis-flex-test/pom.xml b/mybatis-flex-test/pom.xml
index 86ff8794..b0526394 100644
--- a/mybatis-flex-test/pom.xml
+++ b/mybatis-flex-test/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.9.7</version>
+        <version>1.9.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/pom.xml b/pom.xml
index 68a5a48c..b4036187 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>com.mybatis-flex</groupId>
     <artifactId>parent</artifactId>
     <packaging>pom</packaging>
-    <version>1.9.7</version>
+    <version>1.9.8</version>
 
     <name>mybatis-flex</name>
     <url>https://mybatis-flex.com</url>
@@ -63,7 +63,7 @@
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
 
-        <mybatis-flex.version>1.9.7</mybatis-flex.version>
+        <mybatis-flex.version>1.9.8</mybatis-flex.version>
 
         <mybatis.version>3.5.16</mybatis.version>
         <mybatis-spring.version>2.1.2</mybatis-spring.version>