From 1d7bacb6c0dc72881752a78fe8ac0762efb627c6 Mon Sep 17 00:00:00 2001
From: hccake <chengbohua@foxmail.com>
Date: Fri, 12 Mar 2021 14:02:12 +0800
Subject: [PATCH 1/2] =?UTF-8?q?:zap:=20=E6=B7=BB=E5=8A=A0=20lombok-mapstru?=
 =?UTF-8?q?ct-bind=EF=BC=8C=E9=81=BF=E5=85=8D=E9=AB=98=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E7=9A=84=E4=B8=8D=E5=85=BC=E5=AE=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index a601b907d..1e86dbf56 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,8 +40,8 @@
         <skywalking.version>8.3.0</skywalking.version>
         <spring-boot-admin.version>2.3.1</spring-boot-admin.version>
         <!-- 工具类相关 -->
-        <lombok.version>1.16.14</lombok.version>
-        <mapstruct.version>1.4.1.Final</mapstruct.version>
+        <mapstruct.version>1.4.2.Final</mapstruct.version>
+        <lombok-mapstruct-binding.version>0.2.0</lombok-mapstruct-binding.version>
         <hutool.version>5.5.6</hutool.version>
         <easyexcel.verion>2.2.7</easyexcel.verion>
         <velocity.version>2.2</velocity.version>
@@ -227,18 +227,32 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>${lombok.version}</version>
+            <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>org.mapstruct</groupId>
             <artifactId>mapstruct</artifactId> <!-- use mapstruct-jdk8 for Java 8 or higher -->
             <version>${mapstruct.version}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.mapstruct</groupId>
+            <artifactId>mapstruct-processor</artifactId>
+            <version>${mapstruct.version}</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.mapstruct</groupId>
             <artifactId>mapstruct-jdk8</artifactId>
             <version>${mapstruct.version}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok-mapstruct-binding</artifactId>
+            <version>${lombok-mapstruct-binding.version}</version>
+            <optional>true</optional>
         </dependency>
 
         <dependency>
@@ -317,18 +331,6 @@
                 <configuration>
                     <source>${java.version}</source> <!-- or higher, depending on your project -->
                     <target>${java.version}</target> <!-- or higher, depending on your project -->
-                    <annotationProcessorPaths>
-                        <path>
-                            <groupId>org.mapstruct</groupId>
-                            <artifactId>mapstruct-processor</artifactId>
-                            <version>${mapstruct.version}</version>
-                        </path>
-                        <path>
-                            <groupId>org.projectlombok</groupId>
-                            <artifactId>lombok</artifactId>
-                            <version>${lombok.version}</version>
-                        </path>
-                    </annotationProcessorPaths>
                 </configuration>
             </plugin>
         </plugins>

From 7861c3ec3f0c2086b244105175ddf331c48cdba9 Mon Sep 17 00:00:00 2001
From: Hccake <chengbohua@foxmail.com>
Date: Sat, 13 Mar 2021 12:38:52 +0800
Subject: [PATCH 2/2] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=20Lombok=20?=
 =?UTF-8?q?=E5=BB=BA=E9=80=A0=E6=A8=A1=E5=BC=8F=EF=BC=8C=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E6=9E=84=E9=80=A0=E5=87=BD=E6=95=B0=E9=9D=9E=20public,=20mapst?=
 =?UTF-8?q?ruct=20=E6=97=A0=E6=B3=95=E6=9E=84=E9=80=A0=E5=AE=9E=E4=BE=8B?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tool/dal/dataobject/codegen/ToolCodegenColumnDO.java       | 3 ++-
 .../tool/dal/dataobject/codegen/ToolCodegenTableDO.java        | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/cn/iocoder/dashboard/modules/tool/dal/dataobject/codegen/ToolCodegenColumnDO.java b/src/main/java/cn/iocoder/dashboard/modules/tool/dal/dataobject/codegen/ToolCodegenColumnDO.java
index 2cdce8da4..f4482e3c0 100644
--- a/src/main/java/cn/iocoder/dashboard/modules/tool/dal/dataobject/codegen/ToolCodegenColumnDO.java
+++ b/src/main/java/cn/iocoder/dashboard/modules/tool/dal/dataobject/codegen/ToolCodegenColumnDO.java
@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
 
 /**
  * 代码生成 column 字段定义
@@ -17,7 +18,7 @@ import lombok.EqualsAndHashCode;
  */
 @TableName(value = "tool_codegen_column", autoResultMap = true)
 @Data
-@Builder
+@Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class ToolCodegenColumnDO extends BaseDO {
 
diff --git a/src/main/java/cn/iocoder/dashboard/modules/tool/dal/dataobject/codegen/ToolCodegenTableDO.java b/src/main/java/cn/iocoder/dashboard/modules/tool/dal/dataobject/codegen/ToolCodegenTableDO.java
index 315168832..2ce0fac22 100644
--- a/src/main/java/cn/iocoder/dashboard/modules/tool/dal/dataobject/codegen/ToolCodegenTableDO.java
+++ b/src/main/java/cn/iocoder/dashboard/modules/tool/dal/dataobject/codegen/ToolCodegenTableDO.java
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
 
 /**
  * 代码生成 table 表定义
@@ -15,7 +16,7 @@ import lombok.EqualsAndHashCode;
  */
 @TableName(value = "tool_codegen_table", autoResultMap = true)
 @Data
-@Builder
+@Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class ToolCodegenTableDO extends BaseDO {