mirror of
				https://github.com/YunaiV/ruoyi-vue-pro.git
				synced 2025-10-31 10:37:41 +08:00 
			
		
		
		
	Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
Conflicts: pom.xml
This commit is contained in:
		
							
								
								
									
										6
									
								
								pom.xml
									
									
									
									
									
								
							
							
						
						
									
										6
									
								
								pom.xml
									
									
									
									
									
								
							| @ -236,6 +236,12 @@ | ||||
|             <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> | ||||
|  | ||||
| @ -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 { | ||||
|  | ||||
|  | ||||
| @ -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 { | ||||
|  | ||||
|  | ||||
		Reference in New Issue
	
	Block a user
	 YunaiV
					YunaiV