huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2025-01-19 19:50:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
 Conflicts:
	pom.xml
This commit is contained in:
YunaiV 2021-03-13 13:28:23 +08:00
commit daa38661d2
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@ -236,6 +236,12 @@
<version>${mapstruct.version}</version> <version>${mapstruct.version}</version>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct-processor</artifactId>
<version>${mapstruct.version}</version>
<optional>true</optional>
</dependency>
<dependency> <dependency>
<groupId>org.mapstruct</groupId> <groupId>org.mapstruct</groupId>
<artifactId>mapstruct-jdk8</artifactId> <artifactId>mapstruct-jdk8</artifactId>

3
src/main/java/cn/iocoder/dashboard/modules/tool/dal/dataobject/codegen/ToolCodegenColumnDO.java
View File

@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/** /**
* 代码生成 column 字段定义 * 代码生成 column 字段定义
@ -17,7 +18,7 @@ import lombok.EqualsAndHashCode;
*/ */
@TableName(value = "tool_codegen_column", autoResultMap = true) @TableName(value = "tool_codegen_column", autoResultMap = true)
@Data @Data
@Builder @Accessors(chain = true)
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class ToolCodegenColumnDO extends BaseDO { public class ToolCodegenColumnDO extends BaseDO {

3
src/main/java/cn/iocoder/dashboard/modules/tool/dal/dataobject/codegen/ToolCodegenTableDO.java
View File

@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/** /**
* 代码生成 table 表定义 * 代码生成 table 表定义
@ -15,7 +16,7 @@ import lombok.EqualsAndHashCode;
*/ */
@TableName(value = "tool_codegen_table", autoResultMap = true) @TableName(value = "tool_codegen_table", autoResultMap = true)
@Data @Data
@Builder @Accessors(chain = true)
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class ToolCodegenTableDO extends BaseDO { public class ToolCodegenTableDO extends BaseDO {