refactor(lombok): refactor Lombok annotations in entity and DTO classes

- Replace `@Data` with `@Getter`, `@Setter`, and `@SuperBuilder`
- Add `@NoArgsConstructor` and `@AllArgsConstructor` where applicable
- Remove redundant `@EqualsAndHashCode` annotations
- Update usage of `BaseVo` and `PageVo`
- Unify code style to improve readability and maintainability

cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/dto/BaseCreateDto.java

@@ -2,9 +2,13 @@ package com.bgasol.common.core.base.dto;
 
 import com.bgasol.common.core.base.entity.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.SuperBuilder;
 
-@Data
+@Getter
+@Setter
+@SuperBuilder
 @Schema(description = "实体创建通用参数")
 public abstract class BaseCreateDto<ENTITY extends BaseEntity> {
 

cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/dto/BasePageDto.java

@@ -7,9 +7,13 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.Max;
 import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotNull;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.SuperBuilder;
 
-@Data
+@Getter
+@Setter
+@SuperBuilder
 @Schema(description = "分页查询通用参数")
 public abstract class BasePageDto<T extends BaseEntity> {
     @NotNull(message = "页码不能为空")

cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/dto/BaseUpdateDto.java

@@ -3,9 +3,13 @@ package com.bgasol.common.core.base.dto;
 import com.bgasol.common.core.base.entity.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.SuperBuilder;
 
-@Data
+@Getter
+@Setter
+@SuperBuilder
 @Schema(description = "实体更新通用参数")
 public abstract class BaseUpdateDto<ENTITY extends BaseEntity> {
 

cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/entity/BaseEntity.java

@@ -4,12 +4,20 @@ import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.persistence.Id;
 import jakarta.persistence.MappedSuperclass;
-import lombok.Data;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.experimental.SuperBuilder;
 
 import java.io.Serializable;
 import java.util.Date;
 
-@Data
+@Getter
+@Setter
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
 @MappedSuperclass
 public abstract class BaseEntity implements Serializable {
     @Id

cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/entity/BaseTreeEntity.java

@@ -3,13 +3,19 @@ package com.bgasol.common.core.base.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.persistence.*;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.experimental.SuperBuilder;
 
 import java.util.List;
 
-@EqualsAndHashCode(callSuper = true)
-@Data
+@Getter
+@Setter
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
 @MappedSuperclass
 public abstract class BaseTreeEntity<T extends BaseTreeEntity<T>> extends BaseEntity {
     @Schema(description = "父id")

cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/vo/BaseVo.java

@@ -1,19 +1,18 @@
 package com.bgasol.common.core.base.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
 
 import java.util.Date;
 import java.util.List;
 
-@Data
-@Schema(description = "基础响应数据")
-@Builder
-@NoArgsConstructor
+@Getter
+@Setter
+@SuperBuilder
 @AllArgsConstructor
+@NoArgsConstructor
+@Schema(description = "基础响应数据")
 public class BaseVo<T> {
     @Schema(description = "响应码")
     private Integer code;
@@ -36,11 +35,11 @@ public class BaseVo<T> {
      * @param data 响应数据
      */
     static public <T> BaseVo<T> success(T data) {
-        BaseVo<T> baseVo = new BaseVo<>();
-        baseVo.setCode(200);
-        baseVo.setData(data);
-        baseVo.setTime(new Date());
-        return baseVo;
+        return BaseVo.<T>builder()
+                .code(200)
+                .data(data)
+                .time(new Date())
+                .build();
     }
 
     /**
@@ -50,13 +49,12 @@ public class BaseVo<T> {
      * @param message 响应消息
      */
     static public <T> BaseVo<T> success(T data, String message) {
-        BaseVo<T> baseVo = new BaseVo<>();
-        baseVo.setCode(200);
-        baseVo.setMessage(message);
-        baseVo.setData(data);
-        baseVo.setTime(new Date());
-        baseVo.setType(ResponseType.SUCCESS);
-        return baseVo;
+        return BaseVo.<T>builder()
+                .code(200)
+                .data(data)
+                .time(new Date())
+                .message(message)
+                .build();
     }
 
     /**
@@ -65,11 +63,12 @@ public class BaseVo<T> {
      * @param message 响应消息
      */
     static public <T> BaseVo<T> error(String message) {
-        BaseVo<T> baseVo = new BaseVo<>();
-        baseVo.setCode(500);
-        baseVo.setMessage(message);
-        baseVo.setTime(new Date());
-        return baseVo;
+        return BaseVo.<T>builder()
+                .code(500)
+                .time(new Date())
+                .message(message)
+                .type(ResponseType.ERROR)
+                .build();
     }
 
     /**
@@ -79,12 +78,13 @@ public class BaseVo<T> {
      * @param message 响应消息
      */
     static public <T> BaseVo<T> error(T data, String message) {
-        BaseVo<T> baseVo = new BaseVo<>();
-        baseVo.setData(data);
-        baseVo.setCode(500);
-        baseVo.setMessage(message);
-        baseVo.setTime(new Date());
-        return baseVo;
+        return BaseVo.<T>builder()
+                .code(500)
+                .data(data)
+                .time(new Date())
+                .message(message)
+                .type(ResponseType.ERROR)
+                .build();
     }
 
     /**
@@ -94,34 +94,36 @@ public class BaseVo<T> {
      * @param type    响应类型
      */
     static public <T> BaseVo<T> error(String message, ResponseType type) {
-        BaseVo<T> baseVo = new BaseVo<>();
-        baseVo.setCode(500);
-        baseVo.setMessage(message);
-        baseVo.setTime(new Date());
-        baseVo.setType(type);
-        return baseVo;
+        return BaseVo.<T>builder()
+                .code(500)
+                .time(new Date())
+                .message(message)
+                .type(type)
+                .build();
     }
 
     /**
      * 未登录
      */
     public static BaseVo<Void> code401() {
-        BaseVo<Void> baseVo = new BaseVo<>();
-        baseVo.setCode(401);
-        baseVo.setMessage("未登录");
-        baseVo.setTime(new Date());
-        return baseVo;
+        return BaseVo.<Void>builder()
+                .code(401)
+                .time(new Date())
+                .message("未登录")
+                .type(ResponseType.WARNING)
+                .build();
     }
 
     /**
      * 无权限
      */
     public static BaseVo<Void> code403() {
-        BaseVo<Void> baseVo = new BaseVo<>();
-        baseVo.setCode(403);
-        baseVo.setMessage("无权限");
-        baseVo.setTime(new Date());
-        return baseVo;
+        return BaseVo.<Void>builder()
+                .code(403)
+                .time(new Date())
+                .message("无权限")
+                .type(ResponseType.WARNING)
+                .build();
     }
 
     /**
@@ -130,10 +132,12 @@ public class BaseVo<T> {
      * @param verificationResults 参数校验结果
      */
     public static BaseVo<List<VerificationResult>> code400(List<VerificationResult> verificationResults) {
-        BaseVo<List<VerificationResult>> baseVo = new BaseVo<>();
-        baseVo.setCode(400);
-        baseVo.setTime(new Date());
-        baseVo.setData(verificationResults);
-        return baseVo;
+        return BaseVo.<List<VerificationResult>>builder()
+                .code(400)
+                .time(new Date())
+                .data(verificationResults)
+                .message("参数错误")
+                .type(ResponseType.WARNING)
+                .build();
     }
 }

cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/vo/PageVo.java

@@ -2,17 +2,19 @@ package com.bgasol.common.core.base.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
+import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.experimental.SuperBuilder;
 
 import java.util.List;
 
-@Data
-@Schema(description = "分页响应数据")
-@Builder
-@NoArgsConstructor
+@Getter
+@Setter
+@SuperBuilder
 @AllArgsConstructor
+@NoArgsConstructor
+@Schema(description = "分页响应数据")
 public class PageVo<ENTITY> {
     @Schema(description = "总条数")
     private Long total;
@@ -25,12 +27,4 @@ public class PageVo<ENTITY> {
 
     @Schema(description = "响应数据")
     private List<ENTITY> result;
-
-    public PageVo(Long total, List<ENTITY> result, Long page, Long size) {
-        this.total = total;
-        this.result = result;
-
-        this.page = page;
-        this.size = size;
-    }
 }

cloud/common/common-base-model/src/main/java/com/bgasol/common/core/base/vo/VerificationResult.java

@@ -2,13 +2,15 @@ package com.bgasol.common.core.base.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
+import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.experimental.SuperBuilder;
 
-@Data
 @Schema(description = "参数校验结果")
-@Builder
+@Getter
+@Setter
+@SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
 public class VerificationResult {

cloud/common/common-base-web/src/main/java/com/bgasol/common/core/base/service/BaseService.java

@@ -256,7 +256,12 @@ public abstract class BaseService<ENTITY extends BaseEntity, PAGE_DTO extends Ba
         // 查询关联的数据
         this.findOtherTable(entityPage.getRecords());
 
-        return new PageVo<>(entityPage.getTotal(), entityPage.getRecords(), entityPage.getCurrent(), entityPage.getSize());
+        return PageVo.<ENTITY>builder()
+                .total(entityPage.getTotal())
+                .page(entityPage.getCurrent())
+                .size(entityPage.getSize())
+                .result(entityPage.getRecords())
+                .build();
     }
 
     /**

cloud/model/model-file/src/main/java/com/bgasol/model/file/file/dto/FileCreateDto.java

@@ -6,11 +6,15 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.SuperBuilder;
 import org.springframework.web.multipart.MultipartFile;
 
-@EqualsAndHashCode(callSuper = true)
+@Getter
+@Setter
+@SuperBuilder
 @Schema(description = "创建文件")
-@Data
 public class FileCreateDto extends BaseCreateDto<FileEntity> {
     @Schema(description = "要上传的文件块")
     @NotNull(message = "上传文件不能为空")

cloud/model/model-file/src/main/java/com/bgasol/model/file/file/dto/FilePageDto.java

@@ -7,10 +7,14 @@ import com.bgasol.model.file.file.entity.FileEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.SuperBuilder;
 import org.apache.commons.lang3.ObjectUtils;
 
-@EqualsAndHashCode(callSuper = true)
-@Data
+@Getter
+@Setter
+@SuperBuilder
 @Schema(description = "文件分页查询参数")
 public class FilePageDto extends BasePageDto<FileEntity> {
     @Schema(description = "文件名称")

cloud/model/model-file/src/main/java/com/bgasol/model/file/file/dto/FileUpdateDto.java

@@ -5,10 +5,14 @@ import com.bgasol.model.file.file.entity.FileEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.SuperBuilder;
 
-@EqualsAndHashCode(callSuper = true)
+@Getter
+@Setter
+@SuperBuilder
 @Schema(description = "更新文件")
-@Data
 public class FileUpdateDto extends BaseUpdateDto<FileEntity> {
     @Override
     public FileEntity toEntity() {

cloud/model/model-file/src/main/java/com/bgasol/model/file/file/entity/FileEntity.java

@@ -4,12 +4,14 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.bgasol.common.core.base.entity.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-@EqualsAndHashCode(callSuper = true)
-@Data
+import lombok.*;
+import lombok.experimental.SuperBuilder;
 
+@Getter
+@Setter
+@SuperBuilder
+@AllArgsConstructor
+@NoArgsConstructor
 @TableName("t_file")
 @Schema(description = "文件实体类")
 public class FileEntity extends BaseEntity {

cloud/model/model-file/src/main/java/com/bgasol/model/file/image/dto/ImageCreateDto.java

@@ -6,9 +6,13 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.SuperBuilder;
 
-@EqualsAndHashCode(callSuper = true)
-@Data
+@Getter
+@Setter
+@SuperBuilder
 @Schema(description = "创建图片实体类")
 public class ImageCreateDto extends BaseCreateDto<ImageEntity> {
     @Schema(description = "图片名称")

cloud/model/model-file/src/main/java/com/bgasol/model/file/image/dto/ImagePageDto.java

@@ -7,10 +7,14 @@ import com.bgasol.model.file.image.entity.ImageEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.SuperBuilder;
 import org.apache.commons.lang3.ObjectUtils;
 
-@EqualsAndHashCode(callSuper = true)
-@Data
+@Getter
+@Setter
+@SuperBuilder
 @Schema(description = "图片分页查询参数")
 public class ImagePageDto extends BasePageDto<ImageEntity> {
     @Schema(description = "图片名称")

cloud/model/model-file/src/main/java/com/bgasol/model/file/image/dto/ImageUpdateDto.java

@@ -6,9 +6,13 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.SuperBuilder;
 
-@EqualsAndHashCode(callSuper = true)
-@Data
+@Getter
+@Setter
+@SuperBuilder
 @Schema(description = "更新图片实体类")
 public class ImageUpdateDto extends BaseUpdateDto<ImageEntity> {
     @Schema(description = "图片名称")

cloud/model/model-file/src/main/java/com/bgasol/model/file/image/entity/ImageEntity.java

@@ -8,12 +8,14 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.OneToOne;
 import jakarta.persistence.Transient;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-@EqualsAndHashCode(callSuper = true)
-@Data
+import lombok.*;
+import lombok.experimental.SuperBuilder;
 
+@Getter
+@Setter
+@SuperBuilder
+@AllArgsConstructor
+@NoArgsConstructor
 @TableName("t_image")
 @Schema(description = "图片实体类")
 public class ImageEntity extends BaseEntity {

cloud/model/model-system/src/main/java/com/bgasol/model/system/department/dto/DepartmentCreateDto.java

@@ -5,12 +5,16 @@ import com.bgasol.model.system.department.entity.DepartmentEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.SuperBuilder;
 
 import static com.bgasol.model.system.department.mapstruct.DepartmentMapstruct.DEPARTMENT_MAPSTRUCT_IMPL;
 
-@EqualsAndHashCode(callSuper = true)
+@Getter
+@Setter
+@SuperBuilder
 @Schema(description = "新增部门Dto")
-@Data
 public class DepartmentCreateDto extends BaseCreateDto<DepartmentEntity> {
 
     @Schema(description = "部门名")

cloud/model/model-system/src/main/java/com/bgasol/model/system/department/dto/DepartmentUpdateDto.java

@@ -6,10 +6,14 @@ import com.bgasol.model.system.department.mapstruct.DepartmentMapstruct;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.SuperBuilder;
 import org.mapstruct.factory.Mappers;
 
-@EqualsAndHashCode(callSuper = true)
-@Data
+@Getter
+@Setter
+@SuperBuilder
 @Schema(description = "更新部门Dto")
 public class DepartmentUpdateDto extends BaseUpdateDto<DepartmentEntity> {
     @Schema(description = "部门名")

cloud/model/model-system/src/main/java/com/bgasol/model/system/department/entity/DepartmentEntity.java

@@ -4,12 +4,14 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.bgasol.common.core.base.entity.BaseTreeEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-@EqualsAndHashCode(callSuper = true)
-@Data
+import lombok.*;
+import lombok.experimental.SuperBuilder;
 
+@Getter
+@Setter
+@SuperBuilder
+@AllArgsConstructor
+@NoArgsConstructor
 @Schema(description = "部门实体")
 @TableName("t_department")
 public class DepartmentEntity extends BaseTreeEntity<DepartmentEntity> {

cloud/model/model-system/src/main/java/com/bgasol/model/system/menu/dto/MenuCreateDto.java

@@ -3,7 +3,13 @@ package com.bgasol.model.system.menu.dto;
 
 import com.bgasol.common.core.base.dto.BaseCreateDto;
 import com.bgasol.model.system.menu.entity.MenuEntity;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.SuperBuilder;
 
+@Getter
+@Setter
+@SuperBuilder
 public class MenuCreateDto extends BaseCreateDto<MenuEntity> {
     @Override
     public MenuEntity toEntity() {

cloud/model/model-system/src/main/java/com/bgasol/model/system/menu/dto/MenuUpdateDto.java

@@ -3,7 +3,13 @@ package com.bgasol.model.system.menu.dto;
 
 import com.bgasol.common.core.base.dto.BaseUpdateDto;
 import com.bgasol.model.system.menu.entity.MenuEntity;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.SuperBuilder;
 
+@Getter
+@Setter
+@SuperBuilder
 public class MenuUpdateDto extends BaseUpdateDto<MenuEntity> {
     @Override
     public MenuEntity toEntity() {

cloud/model/model-system/src/main/java/com/bgasol/model/system/menu/entity/MenuEntity.java

@@ -6,15 +6,19 @@ import com.bgasol.common.core.base.entity.BaseTreeEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-@EqualsAndHashCode(callSuper = true)
-@Data
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.experimental.SuperBuilder;
 
+@Getter
+@Setter
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
 @Schema(description = "菜单实体")
 @TableName("t_menu")
-
 public class MenuEntity extends BaseTreeEntity<MenuEntity> {
 
     @Schema(description = "菜单名")

cloud/model/model-system/src/main/java/com/bgasol/model/system/permission/dto/PermissionCreateDto.java

@@ -3,7 +3,13 @@ package com.bgasol.model.system.permission.dto;
 
 import com.bgasol.common.core.base.dto.BaseCreateDto;
 import com.bgasol.model.system.permission.entity.PermissionEntity;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.SuperBuilder;
 
+@Getter
+@Setter
+@SuperBuilder
 public class PermissionCreateDto extends BaseCreateDto<PermissionEntity> {
     @Override
     public PermissionEntity toEntity() {

cloud/model/model-system/src/main/java/com/bgasol/model/system/permission/dto/PermissionUpdateDto.java

@@ -3,7 +3,13 @@ package com.bgasol.model.system.permission.dto;
 
 import com.bgasol.common.core.base.dto.BaseUpdateDto;
 import com.bgasol.model.system.permission.entity.PermissionEntity;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.SuperBuilder;
 
+@Getter
+@Setter
+@SuperBuilder
 public class PermissionUpdateDto extends BaseUpdateDto<PermissionEntity> {
     @Override
     public PermissionEntity toEntity() {

cloud/model/model-system/src/main/java/com/bgasol/model/system/permission/entity/PermissionEntity.java

@@ -4,12 +4,14 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.bgasol.common.core.base.entity.BaseTreeEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-@EqualsAndHashCode(callSuper = true)
-@Data
+import lombok.*;
+import lombok.experimental.SuperBuilder;
 
+@Getter
+@Setter
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
 @Schema(description = "权限实体")
 @TableName("t_permission")
 public class PermissionEntity extends BaseTreeEntity<PermissionEntity> {

cloud/model/model-system/src/main/java/com/bgasol/model/system/role/dto/RoleCreateDto.java

@@ -8,6 +8,9 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.SuperBuilder;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -15,8 +18,9 @@ import java.util.stream.Stream;
 
 import static com.bgasol.model.system.role.mapstruct.RoleMapstruct.ROLE_MAPSTRUCT_IMPL;
 
-@EqualsAndHashCode(callSuper = true)
-@Data
+@Getter
+@Setter
+@SuperBuilder
 @Schema(description = "新增角色实体")
 public class RoleCreateDto extends BaseCreateDto<RoleEntity> {
 

cloud/model/model-system/src/main/java/com/bgasol/model/system/role/dto/RoleUpdateDto.java

@@ -8,6 +8,9 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.SuperBuilder;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -15,8 +18,9 @@ import java.util.stream.Stream;
 
 import static com.bgasol.model.system.role.mapstruct.RoleMapstruct.ROLE_MAPSTRUCT_IMPL;
 
-@EqualsAndHashCode(callSuper = true)
-@Data
+@Getter
+@Setter
+@SuperBuilder
 @Schema(description = "更新角色实体")
 public class RoleUpdateDto extends BaseUpdateDto<RoleEntity> {
     @NotBlank(message = "角色名不能为空")

cloud/model/model-system/src/main/java/com/bgasol/model/system/role/entity/RoleEntity.java

@@ -9,14 +9,16 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.JoinTable;
 import jakarta.persistence.ManyToMany;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
 
 import java.util.List;
 
-@EqualsAndHashCode(callSuper = true)
-@Data
-
+@Getter
+@Setter
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
 @Schema(description = "角色实体")
 @TableName("t_role")
 public class RoleEntity extends BaseEntity {

cloud/model/model-system/src/main/java/com/bgasol/model/system/user/dto/UserCreateDto.java

@@ -8,14 +8,18 @@ import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.SuperBuilder;
 import org.apache.commons.lang3.ObjectUtils;
 
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-@Data
-@EqualsAndHashCode(callSuper = true)
+@Getter
+@Setter
+@SuperBuilder
 @Schema(description = "创建用户数据传输对象")
 public class UserCreateDto extends BaseCreateDto<UserEntity> {
     @NotBlank(message = "用户名不能为空")

cloud/model/model-system/src/main/java/com/bgasol/model/system/user/dto/UserPageDto.java

@@ -7,10 +7,14 @@ import com.bgasol.model.system.user.entity.UserEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.SuperBuilder;
 import org.apache.commons.lang3.ObjectUtils;
 
-@EqualsAndHashCode(callSuper = true)
-@Data
+@Getter
+@Setter
+@SuperBuilder
 @Schema(description = "用户分页查询参数")
 public class UserPageDto extends BasePageDto<UserEntity> {
     @Schema(description = "用户名")

cloud/model/model-system/src/main/java/com/bgasol/model/system/user/dto/UserPasswordResetDto.java

@@ -6,9 +6,13 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.SuperBuilder;
 
-@EqualsAndHashCode(callSuper = true)
-@Data
+@Getter
+@Setter
+@SuperBuilder
 @Schema(description = "重置用户密码数据传输对象")
 public class UserPasswordResetDto extends BaseUpdateDto<UserEntity> {
     @NotBlank(message = "新密码不能为空")

cloud/model/model-system/src/main/java/com/bgasol/model/system/user/dto/UserUpdateDto.java

@@ -8,14 +8,18 @@ import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.SuperBuilder;
 import org.apache.commons.lang3.ObjectUtils;
 
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-@Data
-@EqualsAndHashCode(callSuper = true)
+@Getter
+@Setter
+@SuperBuilder
 @Schema(description = "更新用户数据传输对象")
 public class UserUpdateDto extends BaseUpdateDto<UserEntity> {
     @NotBlank(message = "用户名不能为空")

cloud/model/model-system/src/main/java/com/bgasol/model/system/user/entity/UserEntity.java

@@ -8,14 +8,19 @@ import com.bgasol.model.system.role.entity.RoleEntity;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.persistence.*;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.experimental.SuperBuilder;
 
 import java.util.List;
 
-@EqualsAndHashCode(callSuper = true)
-@Data
-
+@Getter
+@Setter
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
 @Schema(description = "用户实体类")
 @TableName("t_user")
 public class UserEntity extends BaseEntity {