diff --git a/.gitee/ISSUE_TEMPLATE/bug.yml b/.gitee/ISSUE_TEMPLATE/bug.yml
index ab6e19ff..2037ad95 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.6,并已搜索过现有的问题 (https://gitee.com/mybatis-flex/mybatis-flex/issues)
+ - label: 我确定已经把 MyBatis-Flex 升级到最新版本 v1.9.7,并已搜索过现有的问题 (https://gitee.com/mybatis-flex/mybatis-flex/issues)
required: true
- type: textarea
attributes:
diff --git a/.gitee/ISSUE_TEMPLATE/question.yml b/.gitee/ISSUE_TEMPLATE/question.yml
index 6e93c7ac..171be324 100644
--- a/.gitee/ISSUE_TEMPLATE/question.yml
+++ b/.gitee/ISSUE_TEMPLATE/question.yml
@@ -13,7 +13,7 @@ body:
attributes:
label: 这个问题是否已经存在:
options:
- - label: 我确定已经把 MyBatis-Flex 升级到最新版本 v1.9.6,并已搜索过现有的问题 (https://gitee.com/mybatis-flex/mybatis-flex/issues)
+ - label: 我确定已经把 MyBatis-Flex 升级到最新版本 v1.9.7,并已搜索过现有的问题 (https://gitee.com/mybatis-flex/mybatis-flex/issues)
required: true
- type: textarea
id: question-description
diff --git a/changes.md b/changes.md
index ef832021..82dff56f 100644
--- a/changes.md
+++ b/changes.md
@@ -2,6 +2,16 @@
查看 [全部代码贡献者](/zh/intro/what-is-mybatisflex.html#贡献者)。
+
+## v1.9.7 20240818
+- 新增:增加 updateBatch 方法是否忽略 null 字段的可配置性,感谢 @wqdTryBest
+- 新增:支持在 APT 中通过表达式选择 package 层级
+- 修复:修复使用 insertBatchSelective 方法抛异常的问题
+- 修复:修复 union sql 的分页查询问题
+- 修复:RelationManyToMany 注解同时通过 selectOneWithRelationsByIdAs 查询报错的问题
+
+
+
## v1.9.6 20240818
- 新增:Mapper 新增 insertBatchSelective 方法
- 新增:新增 SQL SERVER 返回当前日期和时间,感谢 @macy0122
diff --git a/docs/zh/changes.md b/docs/zh/changes.md
index ef832021..82dff56f 100644
--- a/docs/zh/changes.md
+++ b/docs/zh/changes.md
@@ -2,6 +2,16 @@
查看 [全部代码贡献者](/zh/intro/what-is-mybatisflex.html#贡献者)。
+
+## v1.9.7 20240818
+- 新增:增加 updateBatch 方法是否忽略 null 字段的可配置性,感谢 @wqdTryBest
+- 新增:支持在 APT 中通过表达式选择 package 层级
+- 修复:修复使用 insertBatchSelective 方法抛异常的问题
+- 修复:修复 union sql 的分页查询问题
+- 修复:RelationManyToMany 注解同时通过 selectOneWithRelationsByIdAs 查询报错的问题
+
+
+
## v1.9.6 20240818
- 新增:Mapper 新增 insertBatchSelective 方法
- 新增:新增 SQL SERVER 返回当前日期和时间,感谢 @macy0122
diff --git a/docs/zh/intro/getting-started.md b/docs/zh/intro/getting-started.md
index ea141357..188936ce 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'),
com.mybatis-flex
mybatis-flex-spring-boot-starter
- 1.9.6
+ 1.9.7
com.mysql
@@ -81,7 +81,7 @@ VALUES (1, '张三', 18, '2020-01-11'),
com.mybatis-flex
mybatis-flex-spring-boot3-starter
- 1.9.6
+ 1.9.7
com.mysql
diff --git a/docs/zh/intro/gradle.md b/docs/zh/intro/gradle.md
index 7f068f56..1ed435f0 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.6")
+ implementation("com.mybatis-flex:mybatis-flex-core:1.9.7")
}
```
@@ -18,7 +18,7 @@ dependencies {
```groovy
dependencies {
- implementation 'com.mybatis-flex:mybatis-flex-core:1.9.6'
+ implementation 'com.mybatis-flex:mybatis-flex-core:1.9.7'
}
```
@@ -28,7 +28,7 @@ dependencies {
```kotlin
dependencies {
- implementation("com.mybatis-flex:mybatis-flex-spring:1.9.6")
+ implementation("com.mybatis-flex:mybatis-flex-spring:1.9.7")
}
```
@@ -36,7 +36,7 @@ dependencies {
```groovy
dependencies {
- implementation 'com.mybatis-flex:mybatis-flex-spring:1.9.6'
+ implementation 'com.mybatis-flex:mybatis-flex-spring:1.9.7'
}
```
@@ -46,7 +46,7 @@ dependencies {
```kotlin
dependencies {
- implementation("com.mybatis-flex:mybatis-flex-spring-boot-starter:1.9.6")
+ implementation("com.mybatis-flex:mybatis-flex-spring-boot-starter:1.9.7")
}
```
@@ -54,7 +54,7 @@ dependencies {
```groovy
dependencies {
- implementation 'com.mybatis-flex:mybatis-flex-spring-boot-starter:1.9.6'
+ implementation 'com.mybatis-flex:mybatis-flex-spring-boot-starter:1.9.7'
}
```
@@ -70,7 +70,7 @@ dependencies {
```kotlin
dependencies {
- annotationProcessor("com.mybatis-flex:mybatis-flex-processor:1.9.6")
+ annotationProcessor("com.mybatis-flex:mybatis-flex-processor:1.9.7")
}
```
@@ -78,6 +78,6 @@ dependencies {
```groovy
dependencies {
- annotationProcessor 'com.mybatis-flex:mybatis-flex-processor:1.9.6'
+ annotationProcessor 'com.mybatis-flex:mybatis-flex-processor:1.9.7'
}
```
diff --git a/docs/zh/intro/maven.md b/docs/zh/intro/maven.md
index 4a636df4..af358777 100644
--- a/docs/zh/intro/maven.md
+++ b/docs/zh/intro/maven.md
@@ -12,12 +12,12 @@
com.mybatis-flex
mybatis-flex-core
- 1.9.6
+ 1.9.7
com.mybatis-flex
mybatis-flex-processor
- 1.9.6
+ 1.9.7
provided
```
@@ -28,12 +28,12 @@
com.mybatis-flex
mybatis-flex-spring
- 1.9.6
+ 1.9.7
com.mybatis-flex
mybatis-flex-processor
- 1.9.6
+ 1.9.7
provided
``````
@@ -44,12 +44,12 @@
com.mybatis-flex
mybatis-flex-spring-boot-starter
- 1.9.6
+ 1.9.7
com.mybatis-flex
mybatis-flex-processor
- 1.9.6
+ 1.9.7
provided
```
@@ -60,12 +60,12 @@
com.mybatis-flex
mybatis-flex-spring-boot3-starter
- 1.9.6
+ 1.9.7
com.mybatis-flex
mybatis-flex-processor
- 1.9.6
+ 1.9.7
provided
```
@@ -88,7 +88,7 @@
com.mybatis-flex
mybatis-flex-processor
- 1.9.6
+ 1.9.7
diff --git a/docs/zh/others/apt.md b/docs/zh/others/apt.md
index 3b9af366..f8dcb49b 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.6'
+ annotationProcessor 'com.mybatis-flex:mybatis-flex-processor:1.9.7'
}
```
diff --git a/mybatis-flex-annotation/pom.xml b/mybatis-flex-annotation/pom.xml
index 595ef95d..54f232f0 100644
--- a/mybatis-flex-annotation/pom.xml
+++ b/mybatis-flex-annotation/pom.xml
@@ -5,7 +5,7 @@
parent
com.mybatis-flex
- 1.9.6
+ 1.9.7
4.0.0
diff --git a/mybatis-flex-codegen/pom.xml b/mybatis-flex-codegen/pom.xml
index 802c5827..c78fe2be 100644
--- a/mybatis-flex-codegen/pom.xml
+++ b/mybatis-flex-codegen/pom.xml
@@ -5,7 +5,7 @@
parent
com.mybatis-flex
- 1.9.6
+ 1.9.7
4.0.0
@@ -23,7 +23,7 @@
com.mybatis-flex
mybatis-flex-core
- 1.9.6
+ 1.9.7
com.mybatis-flex
diff --git a/mybatis-flex-core/pom.xml b/mybatis-flex-core/pom.xml
index dad0584b..f778b42e 100644
--- a/mybatis-flex-core/pom.xml
+++ b/mybatis-flex-core/pom.xml
@@ -5,7 +5,7 @@
parent
com.mybatis-flex
- 1.9.6
+ 1.9.7
4.0.0
@@ -101,7 +101,7 @@
com.mybatis-flex
mybatis-flex-annotation
- 1.9.6
+ 1.9.7
compile
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 8419d0f7..51173b73 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.6";
+ public static final String VERSION = "1.9.7";
public static final String SQL = "$$sql";
diff --git a/mybatis-flex-dependencies/pom.xml b/mybatis-flex-dependencies/pom.xml
index 31b1288f..1f3e1af7 100644
--- a/mybatis-flex-dependencies/pom.xml
+++ b/mybatis-flex-dependencies/pom.xml
@@ -6,7 +6,7 @@
com.mybatis-flex
mybatis-flex-dependencies
- 1.9.6
+ 1.9.7
pom
@@ -48,7 +48,7 @@
- 1.9.6
+ 1.9.7
diff --git a/mybatis-flex-processor/pom.xml b/mybatis-flex-processor/pom.xml
index 45ae5df8..2fb1489a 100644
--- a/mybatis-flex-processor/pom.xml
+++ b/mybatis-flex-processor/pom.xml
@@ -5,13 +5,13 @@
parent
com.mybatis-flex
- 1.9.6
+ 1.9.7
4.0.0
mybatis-flex-processor
jar
- 1.9.6
+ 1.9.7
@@ -23,7 +23,7 @@
com.mybatis-flex
mybatis-flex-annotation
- 1.9.6
+ 1.9.7
diff --git a/mybatis-flex-solon-plugin/pom.xml b/mybatis-flex-solon-plugin/pom.xml
index 0e9cb1ff..5e436bc1 100644
--- a/mybatis-flex-solon-plugin/pom.xml
+++ b/mybatis-flex-solon-plugin/pom.xml
@@ -5,7 +5,7 @@
parent
com.mybatis-flex
- 1.9.6
+ 1.9.7
4.0.0
diff --git a/mybatis-flex-spring-boot-starter/pom.xml b/mybatis-flex-spring-boot-starter/pom.xml
index 78f74099..3ed64848 100644
--- a/mybatis-flex-spring-boot-starter/pom.xml
+++ b/mybatis-flex-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
parent
com.mybatis-flex
- 1.9.6
+ 1.9.7
4.0.0
@@ -23,7 +23,7 @@
com.mybatis-flex
mybatis-flex-spring
- 1.9.6
+ 1.9.7
@@ -104,7 +104,7 @@
com.mybatis-flex
mybatis-flex-core
- 1.9.6
+ 1.9.7
diff --git a/mybatis-flex-spring-boot3-starter/pom.xml b/mybatis-flex-spring-boot3-starter/pom.xml
index 908ee7e9..ae3f72d4 100644
--- a/mybatis-flex-spring-boot3-starter/pom.xml
+++ b/mybatis-flex-spring-boot3-starter/pom.xml
@@ -6,7 +6,7 @@
com.mybatis-flex
parent
- 1.9.6
+ 1.9.7
mybatis-flex-spring-boot3-starter
@@ -19,7 +19,7 @@
com.mybatis-flex
mybatis-flex-spring-boot-starter
- 1.9.6
+ 1.9.7
org.mybatis
diff --git a/mybatis-flex-spring/pom.xml b/mybatis-flex-spring/pom.xml
index 80f4fca0..669ba5f3 100644
--- a/mybatis-flex-spring/pom.xml
+++ b/mybatis-flex-spring/pom.xml
@@ -5,7 +5,7 @@
parent
com.mybatis-flex
- 1.9.6
+ 1.9.7
4.0.0
@@ -22,7 +22,7 @@
com.mybatis-flex
mybatis-flex-core
- 1.9.6
+ 1.9.7
diff --git a/mybatis-flex-test/mybatis-flex-native-test/pom.xml b/mybatis-flex-test/mybatis-flex-native-test/pom.xml
index af29f4c6..71e62a09 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 @@
mybatis-flex-test
com.mybatis-flex
- 1.9.6
+ 1.9.7
4.0.0
diff --git a/mybatis-flex-test/mybatis-flex-seata-test/pom.xml b/mybatis-flex-test/mybatis-flex-seata-test/pom.xml
index b0d931b4..b237d9eb 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 @@
mybatis-flex-test
com.mybatis-flex
- 1.9.6
+ 1.9.7
4.0.0
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 fdd50171..ab93639c 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 @@
mybatis-flex-test
com.mybatis-flex
- 1.9.6
+ 1.9.7
4.0.0
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 f2002662..047d5f8d 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 @@
mybatis-flex-test
com.mybatis-flex
- 1.9.6
+ 1.9.7
4.0.0
diff --git a/mybatis-flex-test/mybatis-flex-spring-test/pom.xml b/mybatis-flex-test/mybatis-flex-spring-test/pom.xml
index 58a7308b..a20d95dc 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 @@
mybatis-flex-test
com.mybatis-flex
- 1.9.6
+ 1.9.7
4.0.0
diff --git a/mybatis-flex-test/pom.xml b/mybatis-flex-test/pom.xml
index 330602fd..86ff8794 100644
--- a/mybatis-flex-test/pom.xml
+++ b/mybatis-flex-test/pom.xml
@@ -5,7 +5,7 @@
parent
com.mybatis-flex
- 1.9.6
+ 1.9.7
4.0.0
diff --git a/pom.xml b/pom.xml
index 39faefdf..6fb50262 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
com.mybatis-flex
parent
pom
- 1.9.6
+ 1.9.7
mybatis-flex
https://mybatis-flex.com
@@ -55,7 +55,7 @@
8
8
- 1.9.6
+ 1.9.7
3.5.15
2.1.2