Commit 040899d8c9d454a1141082ad5c62e8c965c91cdd
1 parent
661c55cb
reactor:移除 @Accessors 和 @EqualsAndHashCode 注解
Showing
16 changed files
with
1 additions
and
45 deletions
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/biz/system/oauth2/dto/OAuth2AccessTokenRespDTO.java
| 1 | 1 | package cn.iocoder.yudao.framework.common.biz.system.oauth2.dto; |
| 2 | 2 | |
| 3 | 3 | import lombok.Data; |
| 4 | -import lombok.experimental.Accessors; | |
| 5 | 4 | |
| 6 | 5 | import java.io.Serializable; |
| 7 | 6 | import java.time.LocalDateTime; |
| ... | ... | @@ -12,7 +11,6 @@ import java.time.LocalDateTime; |
| 12 | 11 | * @author 芋道源码 |
| 13 | 12 | */ |
| 14 | 13 | @Data |
| 15 | -@Accessors(chain = true) | |
| 16 | 14 | public class OAuth2AccessTokenRespDTO implements Serializable { |
| 17 | 15 | |
| 18 | 16 | /** | ... | ... |
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerImportExcelVO.java
| ... | ... | @@ -10,7 +10,6 @@ import lombok.AllArgsConstructor; |
| 10 | 10 | import lombok.Builder; |
| 11 | 11 | import lombok.Data; |
| 12 | 12 | import lombok.NoArgsConstructor; |
| 13 | -import lombok.experimental.Accessors; | |
| 14 | 13 | |
| 15 | 14 | import static cn.iocoder.yudao.module.crm.enums.DictTypeConstants.*; |
| 16 | 15 | |
| ... | ... | @@ -21,7 +20,6 @@ import static cn.iocoder.yudao.module.crm.enums.DictTypeConstants.*; |
| 21 | 20 | @Builder |
| 22 | 21 | @AllArgsConstructor |
| 23 | 22 | @NoArgsConstructor |
| 24 | -@Accessors(chain = false) // 设置 chain = false,避免用户导入有问题 | |
| 25 | 23 | public class CrmCustomerImportExcelVO { |
| 26 | 24 | |
| 27 | 25 | @ExcelProperty("客户名称") | ... | ... |
yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/codegen/CodegenColumnDO.java
| ... | ... | @@ -9,8 +9,6 @@ import com.baomidou.mybatisplus.annotation.TableId; |
| 9 | 9 | import com.baomidou.mybatisplus.annotation.TableName; |
| 10 | 10 | import com.baomidou.mybatisplus.generator.config.po.TableField; |
| 11 | 11 | import lombok.Data; |
| 12 | -import lombok.EqualsAndHashCode; | |
| 13 | -import lombok.experimental.Accessors; | |
| 14 | 12 | |
| 15 | 13 | /** |
| 16 | 14 | * 代码生成 column 字段定义 |
| ... | ... | @@ -20,8 +18,6 @@ import lombok.experimental.Accessors; |
| 20 | 18 | @TableName(value = "infra_codegen_column", autoResultMap = true) |
| 21 | 19 | @KeySequence("infra_codegen_column_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。 |
| 22 | 20 | @Data |
| 23 | -@Accessors(chain = true) | |
| 24 | -@EqualsAndHashCode(callSuper = true) | |
| 25 | 21 | @TenantIgnore |
| 26 | 22 | public class CodegenColumnDO extends BaseDO { |
| 27 | 23 | ... | ... |
yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/codegen/CodegenTableDO.java
| ... | ... | @@ -11,8 +11,6 @@ import com.baomidou.mybatisplus.annotation.TableId; |
| 11 | 11 | import com.baomidou.mybatisplus.annotation.TableName; |
| 12 | 12 | import com.baomidou.mybatisplus.generator.config.po.TableInfo; |
| 13 | 13 | import lombok.Data; |
| 14 | -import lombok.EqualsAndHashCode; | |
| 15 | -import lombok.experimental.Accessors; | |
| 16 | 14 | |
| 17 | 15 | /** |
| 18 | 16 | * 代码生成 table 表定义 |
| ... | ... | @@ -22,8 +20,6 @@ import lombok.experimental.Accessors; |
| 22 | 20 | @TableName(value = "infra_codegen_table", autoResultMap = true) |
| 23 | 21 | @KeySequence("infra_codegen_table_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。 |
| 24 | 22 | @Data |
| 25 | -@Accessors(chain = true) | |
| 26 | -@EqualsAndHashCode(callSuper = true) | |
| 27 | 23 | @TenantIgnore |
| 28 | 24 | public class CodegenTableDO extends BaseDO { |
| 29 | 25 | ... | ... |
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/device/IotDeviceImportExcelVO.java
| ... | ... | @@ -10,7 +10,6 @@ import lombok.AllArgsConstructor; |
| 10 | 10 | import lombok.Builder; |
| 11 | 11 | import lombok.Data; |
| 12 | 12 | import lombok.NoArgsConstructor; |
| 13 | -import lombok.experimental.Accessors; | |
| 14 | 13 | |
| 15 | 14 | /** |
| 16 | 15 | * 设备 Excel 导入 VO |
| ... | ... | @@ -19,7 +18,6 @@ import lombok.experimental.Accessors; |
| 19 | 18 | @Builder |
| 20 | 19 | @AllArgsConstructor |
| 21 | 20 | @NoArgsConstructor |
| 22 | -@Accessors(chain = false) // 设置 chain = false,避免设备导入有问题 | |
| 23 | 21 | public class IotDeviceImportExcelVO { |
| 24 | 22 | |
| 25 | 23 | @ExcelProperty("设备名称") | ... | ... |
yudao-module-mall/yudao-module-trade/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/aftersale/AfterSaleDO.java
| ... | ... | @@ -11,8 +11,6 @@ import com.baomidou.mybatisplus.annotation.TableField; |
| 11 | 11 | import com.baomidou.mybatisplus.annotation.TableName; |
| 12 | 12 | import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; |
| 13 | 13 | import lombok.Data; |
| 14 | -import lombok.EqualsAndHashCode; | |
| 15 | -import lombok.experimental.Accessors; | |
| 16 | 14 | |
| 17 | 15 | import java.time.LocalDateTime; |
| 18 | 16 | import java.util.List; |
| ... | ... | @@ -25,8 +23,6 @@ import java.util.List; |
| 25 | 23 | @TableName(value = "trade_after_sale", autoResultMap = true) |
| 26 | 24 | @KeySequence("trade_after_sale_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。 |
| 27 | 25 | @Data |
| 28 | -@EqualsAndHashCode(callSuper = true) | |
| 29 | -@Accessors(chain = true) | |
| 30 | 26 | public class AfterSaleDO extends BaseDO { |
| 31 | 27 | |
| 32 | 28 | /** | ... | ... |
yudao-module-mall/yudao-module-trade/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/cart/CartDO.java
| ... | ... | @@ -4,8 +4,6 @@ import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; |
| 4 | 4 | import com.baomidou.mybatisplus.annotation.KeySequence; |
| 5 | 5 | import com.baomidou.mybatisplus.annotation.TableName; |
| 6 | 6 | import lombok.Data; |
| 7 | -import lombok.EqualsAndHashCode; | |
| 8 | -import lombok.experimental.Accessors; | |
| 9 | 7 | |
| 10 | 8 | /** |
| 11 | 9 | * 购物车的商品信息 DO |
| ... | ... | @@ -17,8 +15,6 @@ import lombok.experimental.Accessors; |
| 17 | 15 | @TableName("trade_cart") |
| 18 | 16 | @KeySequence("trade_cart_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。 |
| 19 | 17 | @Data |
| 20 | -@EqualsAndHashCode(callSuper = true) | |
| 21 | -@Accessors(chain = true) | |
| 22 | 18 | public class CartDO extends BaseDO { |
| 23 | 19 | |
| 24 | 20 | // ========= 基础字段 BEGIN ========= | ... | ... |
yudao-module-mall/yudao-module-trade/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderItemDO.java
| ... | ... | @@ -9,8 +9,6 @@ import com.baomidou.mybatisplus.annotation.TableField; |
| 9 | 9 | import com.baomidou.mybatisplus.annotation.TableName; |
| 10 | 10 | import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; |
| 11 | 11 | import lombok.Data; |
| 12 | -import lombok.EqualsAndHashCode; | |
| 13 | -import lombok.experimental.Accessors; | |
| 14 | 12 | |
| 15 | 13 | import java.io.Serializable; |
| 16 | 14 | import java.util.List; |
| ... | ... | @@ -23,8 +21,6 @@ import java.util.List; |
| 23 | 21 | @TableName(value = "trade_order_item", autoResultMap = true) |
| 24 | 22 | @KeySequence("trade_order_item_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。 |
| 25 | 23 | @Data |
| 26 | -@Accessors(chain = true) | |
| 27 | -@EqualsAndHashCode(callSuper = true) | |
| 28 | 24 | public class TradeOrderItemDO extends BaseDO { |
| 29 | 25 | |
| 30 | 26 | // ========== 订单项基本信息 ========== | ... | ... |
yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/controller/app/auth/vo/AppAuthSmsSendReqVO.java
| ... | ... | @@ -5,13 +5,11 @@ import cn.iocoder.yudao.framework.common.validation.Mobile; |
| 5 | 5 | import cn.iocoder.yudao.module.system.enums.sms.SmsSceneEnum; |
| 6 | 6 | import io.swagger.v3.oas.annotations.media.Schema; |
| 7 | 7 | import lombok.Data; |
| 8 | -import lombok.experimental.Accessors; | |
| 9 | 8 | |
| 10 | 9 | import jakarta.validation.constraints.NotNull; |
| 11 | 10 | |
| 12 | 11 | @Schema(description = "用户 APP - 发送手机验证码 Request VO") |
| 13 | 12 | @Data |
| 14 | -@Accessors(chain = true) | |
| 15 | 13 | public class AppAuthSmsSendReqVO { |
| 16 | 14 | |
| 17 | 15 | @Schema(description = "手机号", example = "15601691234") | ... | ... |
yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/controller/app/auth/vo/AppAuthSmsValidateReqVO.java
| ... | ... | @@ -5,7 +5,6 @@ import cn.iocoder.yudao.framework.common.validation.Mobile; |
| 5 | 5 | import cn.iocoder.yudao.module.system.enums.sms.SmsSceneEnum; |
| 6 | 6 | import io.swagger.v3.oas.annotations.media.Schema; |
| 7 | 7 | import lombok.Data; |
| 8 | -import lombok.experimental.Accessors; | |
| 9 | 8 | import org.hibernate.validator.constraints.Length; |
| 10 | 9 | |
| 11 | 10 | import jakarta.validation.constraints.NotEmpty; |
| ... | ... | @@ -14,7 +13,6 @@ import jakarta.validation.constraints.Pattern; |
| 14 | 13 | |
| 15 | 14 | @Schema(description = "用户 APP - 校验手机验证码 Request VO") |
| 16 | 15 | @Data |
| 17 | -@Accessors(chain = true) | |
| 18 | 16 | public class AppAuthSmsValidateReqVO { |
| 19 | 17 | |
| 20 | 18 | @Schema(description = "手机号", example = "15601691234") | ... | ... |
yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/controller/app/order/vo/AppPayOrderSubmitReqVO.java
| ... | ... | @@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.pay.controller.app.order.vo; |
| 3 | 3 | import cn.iocoder.yudao.module.pay.controller.admin.order.vo.PayOrderSubmitReqVO; |
| 4 | 4 | import io.swagger.v3.oas.annotations.media.Schema; |
| 5 | 5 | import lombok.Data; |
| 6 | -import lombok.experimental.Accessors; | |
| 7 | 6 | |
| 8 | 7 | import jakarta.validation.constraints.NotEmpty; |
| 9 | 8 | import jakarta.validation.constraints.NotNull; | ... | ... |
yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/controller/app/order/vo/AppPayOrderSubmitRespVO.java
yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/dal/dataobject/notify/PayNotifyTaskDO.java
| ... | ... | @@ -11,8 +11,6 @@ import com.baomidou.mybatisplus.annotation.KeySequence; |
| 11 | 11 | import com.baomidou.mybatisplus.annotation.TableId; |
| 12 | 12 | import com.baomidou.mybatisplus.annotation.TableName; |
| 13 | 13 | import lombok.Data; |
| 14 | -import lombok.EqualsAndHashCode; | |
| 15 | -import lombok.experimental.Accessors; | |
| 16 | 14 | |
| 17 | 15 | import java.time.LocalDateTime; |
| 18 | 16 | |
| ... | ... | @@ -25,8 +23,6 @@ import java.time.LocalDateTime; |
| 25 | 23 | @TableName("pay_notify_task") |
| 26 | 24 | @KeySequence("pay_notify_task_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。 |
| 27 | 25 | @Data |
| 28 | -@EqualsAndHashCode(callSuper = true) | |
| 29 | -@Accessors(chain = true) | |
| 30 | 26 | public class PayNotifyTaskDO extends TenantBaseDO { |
| 31 | 27 | |
| 32 | 28 | /** | ... | ... |
yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/framework/pay/core/client/dto/refund/PayRefundUnifiedReqDTO.java
| ... | ... | @@ -4,7 +4,6 @@ import lombok.AllArgsConstructor; |
| 4 | 4 | import lombok.Builder; |
| 5 | 5 | import lombok.Data; |
| 6 | 6 | import lombok.NoArgsConstructor; |
| 7 | -import lombok.experimental.Accessors; | |
| 8 | 7 | import org.hibernate.validator.constraints.URL; |
| 9 | 8 | |
| 10 | 9 | import jakarta.validation.constraints.DecimalMin; |
| ... | ... | @@ -16,7 +15,6 @@ import jakarta.validation.constraints.NotNull; |
| 16 | 15 | * |
| 17 | 16 | * @author jason |
| 18 | 17 | */ |
| 19 | -@Accessors(chain = true) | |
| 20 | 18 | @Builder |
| 21 | 19 | @NoArgsConstructor |
| 22 | 20 | @AllArgsConstructor | ... | ... |
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserImportExcelVO.java
| 1 | 1 | package cn.iocoder.yudao.module.system.controller.admin.user.vo.user; |
| 2 | 2 | |
| 3 | +import cn.idev.excel.annotation.ExcelProperty; | |
| 3 | 4 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; |
| 4 | 5 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; |
| 5 | 6 | import cn.iocoder.yudao.module.system.enums.DictTypeConstants; |
| 6 | -import cn.idev.excel.annotation.ExcelProperty; | |
| 7 | 7 | import lombok.AllArgsConstructor; |
| 8 | 8 | import lombok.Builder; |
| 9 | 9 | import lombok.Data; |
| 10 | 10 | import lombok.NoArgsConstructor; |
| 11 | -import lombok.experimental.Accessors; | |
| 12 | 11 | |
| 13 | 12 | /** |
| 14 | 13 | * 用户 Excel 导入 VO |
| ... | ... | @@ -17,7 +16,6 @@ import lombok.experimental.Accessors; |
| 17 | 16 | @Builder |
| 18 | 17 | @AllArgsConstructor |
| 19 | 18 | @NoArgsConstructor |
| 20 | -@Accessors(chain = false) // 设置 chain = false,避免用户导入有问题 | |
| 21 | 19 | public class UserImportExcelVO { |
| 22 | 20 | |
| 23 | 21 | @ExcelProperty("登录名称") | ... | ... |
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/oauth2/OAuth2RefreshTokenDO.java
| ... | ... | @@ -7,8 +7,6 @@ import com.baomidou.mybatisplus.annotation.TableField; |
| 7 | 7 | import com.baomidou.mybatisplus.annotation.TableName; |
| 8 | 8 | import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; |
| 9 | 9 | import lombok.Data; |
| 10 | -import lombok.EqualsAndHashCode; | |
| 11 | -import lombok.experimental.Accessors; | |
| 12 | 10 | |
| 13 | 11 | import java.time.LocalDateTime; |
| 14 | 12 | import java.util.List; |
| ... | ... | @@ -22,8 +20,6 @@ import java.util.List; |
| 22 | 20 | // 由于 Oracle 的 SEQ 的名字长度有限制,所以就先用 system_oauth2_access_token_seq 吧,反正也没啥问题 |
| 23 | 21 | @KeySequence("system_oauth2_access_token_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。 |
| 24 | 22 | @Data |
| 25 | -@EqualsAndHashCode(callSuper = true) | |
| 26 | -@Accessors(chain = true) | |
| 27 | 23 | public class OAuth2RefreshTokenDO extends TenantBaseDO { |
| 28 | 24 | |
| 29 | 25 | /** | ... | ... |