From 3120d10848663c94dabd8bf14164b4dd61f865d5 Mon Sep 17 00:00:00 2001
From: abel533 <abel533@gmail.com>
Date: Sun, 27 Feb 2022 14:30:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85gitee=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=EF=BC=8C=E5=8F=91=E5=B8=834.2.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                             | 11 ++++++++---
 all/dependencies/pom.xml                              |  2 +-
 all/mapper/pom.xml                                    |  2 +-
 all/pom.xml                                           |  6 +++---
 base/pom.xml                                          |  2 +-
 core/pom.xml                                          |  2 +-
 extra/pom.xml                                         |  4 ++--
 generator/pom.xml                                     |  4 ++--
 pom.xml                                               |  2 +-
 .../mapper-spring-boot-autoconfigure/pom.xml          |  2 +-
 .../mapper-spring-boot-sample-annotation/pom.xml      |  2 +-
 .../mapper-spring-boot-sample-xml/pom.xml             |  2 +-
 .../mapper-spring-boot-samples/pom.xml                |  2 +-
 .../mapper-spring-boot-starter/pom.xml                |  2 +-
 spring-boot-starter/pom.xml                           |  6 +++---
 spring/pom.xml                                        |  2 +-
 weekend/pom.xml                                       |  4 ++--
 17 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/README.md b/README.md
index fb59e4207..aa4372f89 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,14 @@
 
 **通用 Mapper 支持 Mybatis-3.2.4 及以上版本。**
 
-## 4.2.0 - 2022-2-26 发布
+## 4.2.1 - 2022-2-27
+
+4.2.0 版本中缺少了 gitee 仓库中的两个合并请求，针对这部分代码，再次发布 4.2.1 版本。
+
+- `orderByDesc`只有最后一个字段是倒序，改为所有参与`orderby`的字段都倒序 Mr 轩少/V1.1.5-orderByDesc-fix
+- 增加Lombok 的`@SuperBuilder、@NoArgsConstructor、@AllArgsConstructor` 注解 tingwen 2020/12/26 18:29 8c816794
+
+## 4.2.0 - 2022-2-26
 
 本次更新最大改动就是统一了所有模块的版本，所有版本都升级为 4.2.0，在之前本项目一共有3个版本号，本次升级前后的版本如下：
 
@@ -40,8 +47,6 @@
 - [新增] 生成实体类的时候,使用表注释创建类的注释 wugh 2019/5/30 11:28 b4acbf48
 - 增加`lombokEqualsAndHashCodeCallSuper`配置，当使用lombok扩展的`EqualsAndHashCode`注解时，可通过此配置（true）为此注解添加`“callSuper = true”`
   ，这对于有继承父类的实体类，如增加支持动态表名时，有用。 calvinit 2019/2/14 13:52 ae901608
-- `orderByDesc`只有最后一个字段是倒序，改为所有参与`orderby`的字段都倒序 Mr 轩少/V1.1.5-orderByDesc-fix
-- 增加Lombok 的`@SuperBuilder、@NoArgsConstructor、@AllArgsConstructor` 注解 tingwen 2020/12/26 18:29 8c816794
 
 ## 还会有 MyBatis 通用 Mapper5 吗？
 
diff --git a/all/dependencies/pom.xml b/all/dependencies/pom.xml
index e01282c9a..37ab57c01 100644
--- a/all/dependencies/pom.xml
+++ b/all/dependencies/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>tk.mybatis</groupId>
         <artifactId>mapper-all</artifactId>
-        <version>4.2.0</version>
+        <version>4.2.1</version>
     </parent>
     <artifactId>mapper-all-dependencies</artifactId>
     <packaging>jar</packaging>
diff --git a/all/mapper/pom.xml b/all/mapper/pom.xml
index 82c02ddb1..7eeeca20c 100644
--- a/all/mapper/pom.xml
+++ b/all/mapper/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>tk.mybatis</groupId>
         <artifactId>mapper-all</artifactId>
-        <version>4.2.0</version>
+        <version>4.2.1</version>
     </parent>
     <artifactId>mapper</artifactId>
     <packaging>jar</packaging>
diff --git a/all/pom.xml b/all/pom.xml
index 081ab9e69..e7e1cb166 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -31,7 +31,7 @@
         <version>3</version>
     </parent>
     <artifactId>mapper-all</artifactId>
-    <version>4.2.0</version>
+    <version>4.2.1</version>
     <packaging>pom</packaging>
 
     <name>mapper-all</name>
@@ -43,8 +43,8 @@
     </modules>
 
   <properties>
-    <mapper-module.version>4.2.0</mapper-module.version>
-    <mapper-weekend.version>4.2.0</mapper-weekend.version>
+    <mapper-module.version>4.2.1</mapper-module.version>
+    <mapper-weekend.version>4.2.1</mapper-weekend.version>
   </properties>
 
 	<dependencyManagement>
diff --git a/base/pom.xml b/base/pom.xml
index 9acedae15..bb00594c2 100644
--- a/base/pom.xml
+++ b/base/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>tk.mybatis</groupId>
         <artifactId>mapper-modules</artifactId>
-        <version>4.2.0</version>
+        <version>4.2.1</version>
     </parent>
     <artifactId>mapper-base</artifactId>
     <packaging>jar</packaging>
diff --git a/core/pom.xml b/core/pom.xml
index ccf19a523..19c67cfee 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>tk.mybatis</groupId>
         <artifactId>mapper-modules</artifactId>
-        <version>4.2.0</version>
+        <version>4.2.1</version>
     </parent>
     <artifactId>mapper-core</artifactId>
     <packaging>jar</packaging>
diff --git a/extra/pom.xml b/extra/pom.xml
index 4bfc68101..fbf2a211d 100644
--- a/extra/pom.xml
+++ b/extra/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>tk.mybatis</groupId>
         <artifactId>mapper-modules</artifactId>
-        <version>4.2.0</version>
+        <version>4.2.1</version>
     </parent>
     <artifactId>mapper-extra</artifactId>
     <packaging>jar</packaging>
@@ -38,7 +38,7 @@
 
     <properties>
         <jdk.version>1.8</jdk.version>
-      <mapper-module.version>4.2.0</mapper-module.version>
+      <mapper-module.version>4.2.1</mapper-module.version>
     </properties>
 
     <dependencies>
diff --git a/generator/pom.xml b/generator/pom.xml
index d8433b3d1..3febfa83a 100644
--- a/generator/pom.xml
+++ b/generator/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>tk.mybatis</groupId>
         <artifactId>mapper-modules</artifactId>
-        <version>4.2.0</version>
+        <version>4.2.1</version>
     </parent>
     <artifactId>mapper-generator</artifactId>
     <packaging>jar</packaging>
@@ -37,7 +37,7 @@
     <description>Mybatis 通用 Mapper 代码生成器</description>
 
     <properties>
-        <mapper-module.version>4.2.0</mapper-module.version>
+        <mapper-module.version>4.2.1</mapper-module.version>
         <freemarker.version>2.3.28</freemarker.version>
         <generator.version>1.3.7</generator.version>
     </properties>
diff --git a/pom.xml b/pom.xml
index 90d57c701..27a03a2c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
         <version>3</version>
     </parent>
     <artifactId>mapper-modules</artifactId>
-    <version>4.2.0</version>
+    <version>4.2.1</version>
     <packaging>pom</packaging>
 
     <name>mapper-parent</name>
diff --git a/spring-boot-starter/mapper-spring-boot-autoconfigure/pom.xml b/spring-boot-starter/mapper-spring-boot-autoconfigure/pom.xml
index 5cf3c7bb3..ce16e92d6 100644
--- a/spring-boot-starter/mapper-spring-boot-autoconfigure/pom.xml
+++ b/spring-boot-starter/mapper-spring-boot-autoconfigure/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>tk.mybatis</groupId>
         <artifactId>mapper-spring-boot</artifactId>
-        <version>4.2.0</version>
+        <version>4.2.1</version>
     </parent>
     <artifactId>mapper-spring-boot-autoconfigure</artifactId>
     <name>mapper-spring-boot-autoconfigure</name>
diff --git a/spring-boot-starter/mapper-spring-boot-samples/mapper-spring-boot-sample-annotation/pom.xml b/spring-boot-starter/mapper-spring-boot-samples/mapper-spring-boot-sample-annotation/pom.xml
index 2bc34ca6f..ce03e290a 100644
--- a/spring-boot-starter/mapper-spring-boot-samples/mapper-spring-boot-sample-annotation/pom.xml
+++ b/spring-boot-starter/mapper-spring-boot-samples/mapper-spring-boot-sample-annotation/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>tk.mybatis</groupId>
         <artifactId>mapper-spring-boot-samples</artifactId>
-        <version>4.2.0</version>
+        <version>4.2.1</version>
     </parent>
     <artifactId>mapper-spring-boot-sample-annotation</artifactId>
     <packaging>jar</packaging>
diff --git a/spring-boot-starter/mapper-spring-boot-samples/mapper-spring-boot-sample-xml/pom.xml b/spring-boot-starter/mapper-spring-boot-samples/mapper-spring-boot-sample-xml/pom.xml
index b6ec79a87..bb54e9a35 100644
--- a/spring-boot-starter/mapper-spring-boot-samples/mapper-spring-boot-sample-xml/pom.xml
+++ b/spring-boot-starter/mapper-spring-boot-samples/mapper-spring-boot-sample-xml/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>tk.mybatis</groupId>
         <artifactId>mapper-spring-boot-samples</artifactId>
-        <version>4.2.0</version>
+        <version>4.2.1</version>
     </parent>
     <artifactId>mapper-spring-boot-sample-xml</artifactId>
     <packaging>jar</packaging>
diff --git a/spring-boot-starter/mapper-spring-boot-samples/pom.xml b/spring-boot-starter/mapper-spring-boot-samples/pom.xml
index 5118df6ac..d0262fe9a 100644
--- a/spring-boot-starter/mapper-spring-boot-samples/pom.xml
+++ b/spring-boot-starter/mapper-spring-boot-samples/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>tk.mybatis</groupId>
         <artifactId>mapper-spring-boot</artifactId>
-        <version>4.2.0</version>
+        <version>4.2.1</version>
     </parent>
     <artifactId>mapper-spring-boot-samples</artifactId>
     <packaging>pom</packaging>
diff --git a/spring-boot-starter/mapper-spring-boot-starter/pom.xml b/spring-boot-starter/mapper-spring-boot-starter/pom.xml
index e118fe6b4..46e1886b8 100644
--- a/spring-boot-starter/mapper-spring-boot-starter/pom.xml
+++ b/spring-boot-starter/mapper-spring-boot-starter/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>tk.mybatis</groupId>
         <artifactId>mapper-spring-boot</artifactId>
-        <version>4.2.0</version>
+        <version>4.2.1</version>
     </parent>
     <artifactId>mapper-spring-boot-starter</artifactId>
     <name>mapper-spring-boot-starter</name>
diff --git a/spring-boot-starter/pom.xml b/spring-boot-starter/pom.xml
index 425493f83..6349aa18b 100644
--- a/spring-boot-starter/pom.xml
+++ b/spring-boot-starter/pom.xml
@@ -32,7 +32,7 @@
         <version>3</version>
     </parent>
     <artifactId>mapper-spring-boot</artifactId>
-    <version>4.2.0</version>
+    <version>4.2.1</version>
     <packaging>pom</packaging>
 
     <name>mapper-spring-boot</name>
@@ -46,8 +46,8 @@
     </modules>
 
   <properties>
-    <mapper-module.version>4.2.0</mapper-module.version>
-    <mapper-weekend.version>4.2.0</mapper-weekend.version>
+    <mapper-module.version>4.2.1</mapper-module.version>
+    <mapper-weekend.version>4.2.1</mapper-weekend.version>
     <mybatis.version>3.5.9</mybatis.version>
     <mybatis-spring.version>2.0.7</mybatis-spring.version>
     <spring-boot.version>2.6.4</spring-boot.version>
diff --git a/spring/pom.xml b/spring/pom.xml
index 5e8281666..8da4d0c60 100644
--- a/spring/pom.xml
+++ b/spring/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>tk.mybatis</groupId>
         <artifactId>mapper-modules</artifactId>
-        <version>4.2.0</version>
+        <version>4.2.1</version>
     </parent>
     <artifactId>mapper-spring</artifactId>
     <packaging>jar</packaging>
diff --git a/weekend/pom.xml b/weekend/pom.xml
index 8d538e8ed..5bef03f70 100644
--- a/weekend/pom.xml
+++ b/weekend/pom.xml
@@ -32,7 +32,7 @@
         <version>3</version>
     </parent>
     <artifactId>mapper-weekend</artifactId>
-    <version>4.2.0</version>
+    <version>4.2.1</version>
 
     <name>weekend</name>
     <description>Mybatis通用Mapper扩展 - weekend</description>
@@ -54,7 +54,7 @@
 
     <properties>
         <jdk.version>1.8</jdk.version>
-      <mapper-module.version>4.2.0</mapper-module.version>
+      <mapper-module.version>4.2.1</mapper-module.version>
     </properties>
 
     <dependencies>