BJ_ZTEITS-Developers / parking-cloud-yudao

Commit daa38661d2611a0ee1c98d2c55bccdc00b83828d

Authored by YunaiV
2 parents efde1280 7861c3ec

Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 

 Conflicts:
	pom.xml
Inline Side-by-side
Showing 3 changed files with 10 additions and 2 deletions
... ... @@ -238,6 +238,12 @@
238 238 </dependency>
239 239 <dependency>
240 240 <groupId>org.mapstruct</groupId>
  241 + <artifactId>mapstruct-processor</artifactId>
  242 + <version>${mapstruct.version}</version>
  243 + <optional>true</optional>
  244 + </dependency>
  245 + <dependency>
  246 + <groupId>org.mapstruct</groupId>
241 247 <artifactId>mapstruct-jdk8</artifactId>
242 248 <version>${mapstruct.version}</version>
243 249 <optional>true</optional>
... ...
src/main/java/cn/iocoder/dashboard/modules/tool/dal/dataobject/codegen/ToolCodegenColumnDO.java
  View file @daa3866
... ... @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
9 9 import lombok.Builder;
10 10 import lombok.Data;
11 11 import lombok.EqualsAndHashCode;
  12 +import lombok.experimental.Accessors;
12 13  
13 14 /**
14 15 * 代码生成 column 字段定义
... ... @@ -17,7 +18,7 @@ import lombok.EqualsAndHashCode;
17 18 */
18 19 @TableName(value = "tool_codegen_column", autoResultMap = true)
19 20 @Data
20   -@Builder
  21 +@Accessors(chain = true)
21 22 @EqualsAndHashCode(callSuper = true)
22 23 public class ToolCodegenColumnDO extends BaseDO {
23 24  
... ...
src/main/java/cn/iocoder/dashboard/modules/tool/dal/dataobject/codegen/ToolCodegenTableDO.java
  View file @daa3866
... ... @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
7 7 import lombok.Builder;
8 8 import lombok.Data;
9 9 import lombok.EqualsAndHashCode;
  10 +import lombok.experimental.Accessors;
10 11  
11 12 /**
12 13 * 代码生成 table 表定义
... ... @@ -15,7 +16,7 @@ import lombok.EqualsAndHashCode;
15 16 */
16 17 @TableName(value = "tool_codegen_table", autoResultMap = true)
17 18 @Data
18   -@Builder
  19 +@Accessors(chain = true)
19 20 @EqualsAndHashCode(callSuper = true)
20 21 public class ToolCodegenTableDO extends BaseDO {
21 22  
... ...