补充gitee合并内容，发布4.2.1

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 吗？
 

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>