build: v1.9.7 release (^.^)YYa!!

.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:

.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

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

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

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.6</version>
+        <version>1.9.7</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.6</version>
+        <version>1.9.7</version>
     </dependency>
     <dependency>
         <groupId>com.mysql</groupId>

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'
 }
 ```

docs/zh/intro/maven.md

@@ -12,12 +12,12 @@
 <dependency>
     <groupId>com.mybatis-flex</groupId>
     <artifactId>mybatis-flex-core</artifactId>
-    <version>1.9.6</version>
+    <version>1.9.7</version>
 </dependency>
 <dependency>
     <groupId>com.mybatis-flex</groupId>
     <artifactId>mybatis-flex-processor</artifactId>
-    <version>1.9.6</version>
+    <version>1.9.7</version>
     <scope>provided</scope>
 </dependency>
 ```
@@ -28,12 +28,12 @@
 <dependency>
     <groupId>com.mybatis-flex</groupId>
     <artifactId>mybatis-flex-spring</artifactId>
-    <version>1.9.6</version>
+    <version>1.9.7</version>
 </dependency>
 <dependency>
     <groupId>com.mybatis-flex</groupId>
     <artifactId>mybatis-flex-processor</artifactId>
-    <version>1.9.6</version>
+    <version>1.9.7</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.6</version>
+    <version>1.9.7</version>
 </dependency>
 <dependency>
     <groupId>com.mybatis-flex</groupId>
     <artifactId>mybatis-flex-processor</artifactId>
-    <version>1.9.6</version>
+    <version>1.9.7</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.6</version>
+    <version>1.9.7</version>
 </dependency>
 <dependency>
     <groupId>com.mybatis-flex</groupId>
     <artifactId>mybatis-flex-processor</artifactId>
-    <version>1.9.6</version>
+    <version>1.9.7</version>
     <scope>provided</scope>
 </dependency>
 ```
@@ -88,7 +88,7 @@
             <path>
                 <groupId>com.mybatis-flex</groupId>
                 <artifactId>mybatis-flex-processor</artifactId>
-                <version>1.9.6</version>
+                <version>1.9.7</version>
             </path>
         </annotationProcessorPaths>
     </configuration>

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'
 }
 ```
 

mybatis-flex-annotation/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.9.6</version>
+        <version>1.9.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

mybatis-flex-codegen/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.9.6</version>
+        <version>1.9.7</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.6</version>
+            <version>1.9.7</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.mybatis-flex</groupId>

mybatis-flex-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.9.6</version>
+        <version>1.9.7</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.6</version>
+            <version>1.9.7</version>
             <scope>compile</scope>
         </dependency>
 

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";

mybatis-flex-dependencies/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.mybatis-flex</groupId>
     <artifactId>mybatis-flex-dependencies</artifactId>
-    <version>1.9.6</version>
+    <version>1.9.7</version>
 
     <packaging>pom</packaging>
 
@@ -48,7 +48,7 @@
         </developer>
     </developers>
     <properties>
-        <mybatis-flex.version>1.9.6</mybatis-flex.version>
+        <mybatis-flex.version>1.9.7</mybatis-flex.version>
     </properties>
 
     <dependencyManagement>

mybatis-flex-processor/pom.xml

@@ -5,13 +5,13 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.9.6</version>
+        <version>1.9.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>mybatis-flex-processor</artifactId>
     <packaging>jar</packaging>
-    <version>1.9.6</version>
+    <version>1.9.7</version>
 
 
     <properties>
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>com.mybatis-flex</groupId>
             <artifactId>mybatis-flex-annotation</artifactId>
-            <version>1.9.6</version>
+            <version>1.9.7</version>
         </dependency>
     </dependencies>
 

mybatis-flex-solon-plugin/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.9.6</version>
+        <version>1.9.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

mybatis-flex-spring-boot-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.9.6</version>
+        <version>1.9.7</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.6</version>
+            <version>1.9.7</version>
         </dependency>
 
         <dependency>
@@ -104,7 +104,7 @@
         <dependency>
             <groupId>com.mybatis-flex</groupId>
             <artifactId>mybatis-flex-core</artifactId>
-            <version>1.9.6</version>
+            <version>1.9.7</version>
         </dependency>
 
     </dependencies>

mybatis-flex-spring-boot3-starter/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.mybatis-flex</groupId>
         <artifactId>parent</artifactId>
-        <version>1.9.6</version>
+        <version>1.9.7</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.6</version>
+            <version>1.9.7</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.mybatis</groupId>

mybatis-flex-spring/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.9.6</version>
+        <version>1.9.7</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.6</version>
+            <version>1.9.7</version>
         </dependency>
 
         <dependency>

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.6</version>
+        <version>1.9.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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.6</version>
+		<version>1.9.7</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

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.6</version>
+        <version>1.9.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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.6</version>
+        <version>1.9.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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.6</version>
+        <version>1.9.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

mybatis-flex-test/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.mybatis-flex</groupId>
-        <version>1.9.6</version>
+        <version>1.9.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

pom.xml

@@ -7,7 +7,7 @@
     <groupId>com.mybatis-flex</groupId>
     <artifactId>parent</artifactId>
     <packaging>pom</packaging>
-    <version>1.9.6</version>
+    <version>1.9.7</version>
 
     <name>mybatis-flex</name>
     <url>https://mybatis-flex.com</url>
@@ -55,7 +55,7 @@
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
 
-        <mybatis-flex.version>1.9.6</mybatis-flex.version>
+        <mybatis-flex.version>1.9.7</mybatis-flex.version>
 
         <mybatis.version>3.5.15</mybatis.version>
         <mybatis-spring.version>2.1.2</mybatis-spring.version>