diff --git a/sherly-common/src/main/java/com/guzi/sherly/model/admin/Department.java b/sherly-common/src/main/java/com/guzi/sherly/model/admin/Department.java index b9dd26506e5882f5448ffd8fd5d58da1e1fb1508..31a9a6b42355dcbc18fe50d0d3a69d33743c3708 100644 --- a/sherly-common/src/main/java/com/guzi/sherly/model/admin/Department.java +++ b/sherly-common/src/main/java/com/guzi/sherly/model/admin/Department.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.guzi.sherly.model.BaseModel; import lombok.Data; +import lombok.EqualsAndHashCode; /** * @author 谷子毅 @@ -12,6 +13,7 @@ import lombok.Data; */ @Data @TableName("sys_department") +@EqualsAndHashCode(callSuper = true) public class Department extends BaseModel { /** 部门编号 */ @TableId(type = IdType.AUTO) diff --git a/sherly-common/src/main/java/com/guzi/sherly/model/admin/EmailConfig.java b/sherly-common/src/main/java/com/guzi/sherly/model/admin/EmailConfig.java index db6141b0ee88f3e10cef0be94ec04abefb8ef5ca..f61bade0c44d391457922643c99266f8cee4af26 100644 --- a/sherly-common/src/main/java/com/guzi/sherly/model/admin/EmailConfig.java +++ b/sherly-common/src/main/java/com/guzi/sherly/model/admin/EmailConfig.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.guzi.sherly.model.BaseModel; import lombok.Data; +import lombok.EqualsAndHashCode; /** * @author 谷子毅 @@ -12,6 +13,7 @@ import lombok.Data; */ @Data @TableName("sys_email_config") +@EqualsAndHashCode(callSuper = true) public class EmailConfig extends BaseModel { /** 编号 */ @TableId(type = IdType.AUTO) diff --git a/sherly-common/src/main/java/com/guzi/sherly/model/admin/ErrorCode.java b/sherly-common/src/main/java/com/guzi/sherly/model/admin/ErrorCode.java index 27588e61804be46e4754c6d6f2017210a298804c..97af77ed8ca37725e59339a134e7e5607443b0c7 100644 --- a/sherly-common/src/main/java/com/guzi/sherly/model/admin/ErrorCode.java +++ b/sherly-common/src/main/java/com/guzi/sherly/model/admin/ErrorCode.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.guzi.sherly.model.BaseModel; import lombok.Data; +import lombok.EqualsAndHashCode; /** * @author 谷子毅 @@ -12,6 +13,7 @@ import lombok.Data; */ @Data @TableName("ge_error_code") +@EqualsAndHashCode(callSuper = true) public class ErrorCode extends BaseModel { /** 错误编号 */ @TableId(type = IdType.AUTO) diff --git a/sherly-common/src/main/java/com/guzi/sherly/model/admin/Menu.java b/sherly-common/src/main/java/com/guzi/sherly/model/admin/Menu.java index e7e3814d7d885f27758b80f6e24436529c3d4f39..29789828619d8d9d097cc793a7f6472f36600f2c 100644 --- a/sherly-common/src/main/java/com/guzi/sherly/model/admin/Menu.java +++ b/sherly-common/src/main/java/com/guzi/sherly/model/admin/Menu.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.guzi.sherly.model.BaseModel; import lombok.Data; +import lombok.EqualsAndHashCode; /** * @author 谷子毅 @@ -12,6 +13,7 @@ import lombok.Data; */ @Data @TableName("sys_menu") +@EqualsAndHashCode(callSuper = true) public class Menu extends BaseModel { /** 菜单编号 */ @TableId(type = IdType.AUTO) diff --git a/sherly-common/src/main/java/com/guzi/sherly/model/admin/Module.java b/sherly-common/src/main/java/com/guzi/sherly/model/admin/Module.java index dd399cd8722220eca6ed68675105bc523c07467c..909243815112bbc65d296d01844399accb2b1cbb 100644 --- a/sherly-common/src/main/java/com/guzi/sherly/model/admin/Module.java +++ b/sherly-common/src/main/java/com/guzi/sherly/model/admin/Module.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.guzi.sherly.model.BaseModel; import lombok.Data; +import lombok.EqualsAndHashCode; /** * @author 谷子毅 @@ -12,6 +13,7 @@ import lombok.Data; */ @Data @TableName("ge_module") +@EqualsAndHashCode(callSuper = true) public class Module extends BaseModel { /** 模块编号 */ diff --git a/sherly-common/src/main/java/com/guzi/sherly/model/admin/OssConfig.java b/sherly-common/src/main/java/com/guzi/sherly/model/admin/OssConfig.java index b3f83771b5ad8f77426bae0a97b9c39e7b0f51a6..94aa58fc97d73bb931a4dc29b236f474485e9117 100644 --- a/sherly-common/src/main/java/com/guzi/sherly/model/admin/OssConfig.java +++ b/sherly-common/src/main/java/com/guzi/sherly/model/admin/OssConfig.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; import com.guzi.sherly.model.BaseModel; import com.guzi.sherly.modules.storage.model.OssClientConfig; import lombok.Data; +import lombok.EqualsAndHashCode; /** * @author 谷子毅 @@ -15,6 +16,7 @@ import lombok.Data; */ @Data @TableName(value = "sys_oss_config", autoResultMap = true) +@EqualsAndHashCode(callSuper = true) public class OssConfig extends BaseModel { /** 配置编号 */ @TableId(type = IdType.AUTO) diff --git a/sherly-common/src/main/java/com/guzi/sherly/model/admin/OssFile.java b/sherly-common/src/main/java/com/guzi/sherly/model/admin/OssFile.java index 43943b6912068d5d964a6984d98c25a62f994ad5..2a87d634ecf7821bb364593f987995a9dd661c6f 100644 --- a/sherly-common/src/main/java/com/guzi/sherly/model/admin/OssFile.java +++ b/sherly-common/src/main/java/com/guzi/sherly/model/admin/OssFile.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.guzi.sherly.model.BaseModel; import lombok.Data; +import lombok.EqualsAndHashCode; /** * @author 谷子毅 @@ -12,6 +13,7 @@ import lombok.Data; */ @Data @TableName("sys_oss_file") +@EqualsAndHashCode(callSuper = true) public class OssFile extends BaseModel { /** 文件编号 */ @TableId(type = IdType.AUTO) diff --git a/sherly-common/src/main/java/com/guzi/sherly/model/admin/Role.java b/sherly-common/src/main/java/com/guzi/sherly/model/admin/Role.java index cc29b266740462e6946c4f0df57cecc0a5d8210b..1c2ad1031ef5245e388c7ce2fcb2bfa1603ff003 100644 --- a/sherly-common/src/main/java/com/guzi/sherly/model/admin/Role.java +++ b/sherly-common/src/main/java/com/guzi/sherly/model/admin/Role.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.guzi.sherly.model.BaseModel; import lombok.Data; +import lombok.EqualsAndHashCode; /** * @author 谷子毅 @@ -12,6 +13,7 @@ import lombok.Data; */ @Data @TableName("sys_role") +@EqualsAndHashCode(callSuper = true) public class Role extends BaseModel { /** 角色编号 */ @TableId(type = IdType.AUTO) diff --git a/sherly-common/src/main/java/com/guzi/sherly/model/admin/RoleMenu.java b/sherly-common/src/main/java/com/guzi/sherly/model/admin/RoleMenu.java index e0f36aa891b5a98a5faf7695020556051d27555c..6e5a7768ca1175176b34e542a69a3f0f93bcf746 100644 --- a/sherly-common/src/main/java/com/guzi/sherly/model/admin/RoleMenu.java +++ b/sherly-common/src/main/java/com/guzi/sherly/model/admin/RoleMenu.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.guzi.sherly.model.BaseModel; import lombok.Data; +import lombok.EqualsAndHashCode; /** * @author 谷子毅 @@ -12,6 +13,7 @@ import lombok.Data; */ @Data @TableName("sys_role_menu") +@EqualsAndHashCode(callSuper = true) public class RoleMenu extends BaseModel { /** 编号 */ @TableId(type = IdType.AUTO) diff --git a/sherly-common/src/main/java/com/guzi/sherly/model/admin/Tenant.java b/sherly-common/src/main/java/com/guzi/sherly/model/admin/Tenant.java index f403f3f75fc7d24a21decc8e5fed6392bbb01ab3..88d2860164d9811c738e46143533513b44a3fa8c 100644 --- a/sherly-common/src/main/java/com/guzi/sherly/model/admin/Tenant.java +++ b/sherly-common/src/main/java/com/guzi/sherly/model/admin/Tenant.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.guzi.sherly.model.BaseModel; import lombok.Data; +import lombok.EqualsAndHashCode; import java.util.Date; @@ -14,6 +15,7 @@ import java.util.Date; */ @Data @TableName("ge_tenant") +@EqualsAndHashCode(callSuper = true) public class Tenant extends BaseModel { /** 租户编号 */ diff --git a/sherly-common/src/main/java/com/guzi/sherly/model/admin/TenantPackage.java b/sherly-common/src/main/java/com/guzi/sherly/model/admin/TenantPackage.java index a12e456d4fa1436e88634bd58ba023db9c1cabab..2ba54565bcc8acd10f7a1cb94f808a68074c92ff 100644 --- a/sherly-common/src/main/java/com/guzi/sherly/model/admin/TenantPackage.java +++ b/sherly-common/src/main/java/com/guzi/sherly/model/admin/TenantPackage.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.guzi.sherly.model.BaseModel; import lombok.Data; +import lombok.EqualsAndHashCode; /** * @author 谷子毅 @@ -12,6 +13,7 @@ import lombok.Data; */ @Data @TableName("ge_tenant_package") +@EqualsAndHashCode(callSuper = true) public class TenantPackage extends BaseModel { /** 租户套餐编号 */ diff --git a/sherly-common/src/main/java/com/guzi/sherly/model/admin/TenantPackageMenu.java b/sherly-common/src/main/java/com/guzi/sherly/model/admin/TenantPackageMenu.java index 7f30719bfba41b0c2a702ec44fc539773e5c9ed6..820f6c9013ecd6f9b303684cd2bc30b5aa7a767f 100644 --- a/sherly-common/src/main/java/com/guzi/sherly/model/admin/TenantPackageMenu.java +++ b/sherly-common/src/main/java/com/guzi/sherly/model/admin/TenantPackageMenu.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.guzi.sherly.model.BaseModel; import lombok.Data; +import lombok.EqualsAndHashCode; /** * @author 谷子毅 @@ -12,6 +13,7 @@ import lombok.Data; */ @Data @TableName("ge_tenant_package_menu") +@EqualsAndHashCode(callSuper = true) public class TenantPackageMenu extends BaseModel { /** 编号 */ @TableId(type = IdType.AUTO) diff --git a/sherly-common/src/main/java/com/guzi/sherly/model/admin/User.java b/sherly-common/src/main/java/com/guzi/sherly/model/admin/User.java index bfd949aabdc837eabdfd82179f12ce370c26599a..1e2caf67ff614a6dda3d8a911628919dd04b3f91 100644 --- a/sherly-common/src/main/java/com/guzi/sherly/model/admin/User.java +++ b/sherly-common/src/main/java/com/guzi/sherly/model/admin/User.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.guzi.sherly.model.BaseModel; import lombok.Data; +import lombok.EqualsAndHashCode; import java.util.Date; @@ -14,6 +15,7 @@ import java.util.Date; */ @Data @TableName("sys_user") +@EqualsAndHashCode(callSuper = true) public class User extends BaseModel { /** 用户编号 */ @TableId(type = IdType.AUTO) diff --git a/sherly-common/src/main/java/com/guzi/sherly/model/admin/UserRole.java b/sherly-common/src/main/java/com/guzi/sherly/model/admin/UserRole.java index 966e1e4cbe4fad2954ba2acbba4c4a554968e20f..cda7dc5f9d6478af9fc51fcf5413bdf01542347b 100644 --- a/sherly-common/src/main/java/com/guzi/sherly/model/admin/UserRole.java +++ b/sherly-common/src/main/java/com/guzi/sherly/model/admin/UserRole.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.guzi.sherly.model.BaseModel; import lombok.Data; +import lombok.EqualsAndHashCode; /** * @author 谷子毅 @@ -13,6 +14,7 @@ import lombok.Data; @Data @TableName("sys_user_role") +@EqualsAndHashCode(callSuper = true) public class UserRole extends BaseModel { /** 编号 */ @TableId(type = IdType.AUTO) diff --git a/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/ErrorCodePageDTO.java b/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/ErrorCodePageDTO.java index b41d8c1207e8f31e1761015f6c0723c9fcc605f9..89baaafc20ad6fc5609e2917968e7cb388f61fad 100644 --- a/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/ErrorCodePageDTO.java +++ b/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/ErrorCodePageDTO.java @@ -3,12 +3,14 @@ package com.guzi.sherly.model.dto; import com.guzi.sherly.model.PageQuery; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; /** * @author 李仁杰 * @date 2022/9/1 */ @Data +@EqualsAndHashCode(callSuper = true) public class ErrorCodePageDTO extends PageQuery { /** 错误代码 */ diff --git a/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/LoginLogPageDTO.java b/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/LoginLogPageDTO.java index c991ee67d5303b7361e33d74cf29089a87351bf8..be907057c705df1eae3f231c686db1bbc5bfb605 100644 --- a/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/LoginLogPageDTO.java +++ b/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/LoginLogPageDTO.java @@ -4,6 +4,7 @@ import cn.hutool.core.date.DatePattern; import com.guzi.sherly.model.PageQuery; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; @@ -13,6 +14,7 @@ import java.util.Date; * @date 2022/7/15 */ @Data +@EqualsAndHashCode(callSuper = true) public class LoginLogPageDTO extends PageQuery { /** 登录账号 */ diff --git a/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/NoticePageDTO.java b/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/NoticePageDTO.java index ac14537a7ce7a14e70bf9a935234a0b5a4606cbb..4e0488a534836e9623ee3a9b34f1f5a69cc07e84 100644 --- a/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/NoticePageDTO.java +++ b/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/NoticePageDTO.java @@ -2,12 +2,14 @@ package com.guzi.sherly.model.dto; import com.guzi.sherly.model.PageQuery; import lombok.Data; +import lombok.EqualsAndHashCode; /** * @author 谷子毅 * @date 2022/12/29 */ @Data +@EqualsAndHashCode(callSuper = true) public class NoticePageDTO extends PageQuery { /** 消息类型[enum] */ private Integer noticeType; diff --git a/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/OperationLogPageDTO.java b/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/OperationLogPageDTO.java index 3798bbd241448afe6a2182ed9ca9faaaae4910e9..0c5d86bb7d63a9f8934676c8a392ef42122d46ad 100644 --- a/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/OperationLogPageDTO.java +++ b/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/OperationLogPageDTO.java @@ -4,6 +4,7 @@ import cn.hutool.core.date.DatePattern; import com.guzi.sherly.model.PageQuery; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; @@ -14,6 +15,7 @@ import java.util.List; * @date 2022/7/15 */ @Data +@EqualsAndHashCode(callSuper = true) public class OperationLogPageDTO extends PageQuery { /** 日志类型[enum] */ @ApiModelProperty(value = "日志类型[enum]") diff --git a/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/OssConfigPageDTO.java b/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/OssConfigPageDTO.java index 93359713f2b37e6286fe8a517d316585138b497e..dfcb5a6662ab8e7be641cc3c712557f65e685724 100644 --- a/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/OssConfigPageDTO.java +++ b/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/OssConfigPageDTO.java @@ -2,11 +2,13 @@ package com.guzi.sherly.model.dto; import com.guzi.sherly.model.PageQuery; import lombok.Data; +import lombok.EqualsAndHashCode; /** * @author 谷子毅 * @date 2022/6/24 */ @Data +@EqualsAndHashCode(callSuper = true) public class OssConfigPageDTO extends PageQuery { } diff --git a/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/OssFilePageDTO.java b/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/OssFilePageDTO.java index 98fcd512b543de30175801e320b71dd275028ca8..b74820401445757e74b99f1e9ffb169b28c8f3c7 100644 --- a/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/OssFilePageDTO.java +++ b/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/OssFilePageDTO.java @@ -4,6 +4,7 @@ import cn.hutool.core.date.DatePattern; import com.guzi.sherly.model.PageQuery; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; @@ -13,6 +14,7 @@ import java.util.Date; * @date 2022/6/29 */ @Data +@EqualsAndHashCode(callSuper = true) public class OssFilePageDTO extends PageQuery { /** 配置编号 */ diff --git a/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/RolePageDTO.java b/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/RolePageDTO.java index fef2aff0c480a3fcd717fd7d707c9856016f5d5b..5703b70556e13869a653c67a6299d1592572ec76 100644 --- a/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/RolePageDTO.java +++ b/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/RolePageDTO.java @@ -3,12 +3,14 @@ package com.guzi.sherly.model.dto; import com.guzi.sherly.model.PageQuery; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; /** * @author 谷子毅 * @date 2022/4/7 */ @Data +@EqualsAndHashCode(callSuper = true) public class RolePageDTO extends PageQuery { /** 角色名称 */ @ApiModelProperty(value = "角色名称") diff --git a/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/ScheduleTaskLogPageDTO.java b/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/ScheduleTaskLogPageDTO.java index e3a1d671c394291a39a48d05cc7491a2a9d69172..fb8a3f499b6831f53b01be0623bf9493a5de673b 100644 --- a/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/ScheduleTaskLogPageDTO.java +++ b/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/ScheduleTaskLogPageDTO.java @@ -3,12 +3,14 @@ package com.guzi.sherly.model.dto; import com.guzi.sherly.model.PageQuery; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; /** * @author 谷子毅 * @date 2022/12/27 */ @Data +@EqualsAndHashCode(callSuper = true) public class ScheduleTaskLogPageDTO extends PageQuery { /** 定时任务编号 */ @ApiModelProperty(value = "定时任务编号") diff --git a/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/ScheduleTaskPageDTO.java b/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/ScheduleTaskPageDTO.java index 3d3e10e6bed681b3dd5db4edc7302817f2efa7cc..1aa13e89b09618f21e9de7cbf004ec82816ba3bc 100644 --- a/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/ScheduleTaskPageDTO.java +++ b/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/ScheduleTaskPageDTO.java @@ -2,12 +2,14 @@ package com.guzi.sherly.model.dto; import com.guzi.sherly.model.PageQuery; import lombok.Data; +import lombok.EqualsAndHashCode; /** * @author 谷子毅 * @date 2022/12/6 */ @Data +@EqualsAndHashCode(callSuper = true) public class ScheduleTaskPageDTO extends PageQuery { } diff --git a/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/TenantPackagePageDTO.java b/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/TenantPackagePageDTO.java index 1f53a23f479b3033d56e8cfa6c5d64a6cf458b86..daef4956d0917af302106f5cc05a836cdfc9f112 100644 --- a/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/TenantPackagePageDTO.java +++ b/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/TenantPackagePageDTO.java @@ -3,12 +3,14 @@ package com.guzi.sherly.model.dto; import com.guzi.sherly.model.PageQuery; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; /** * @author 谷子毅 * @date 2022/11/15 */ @Data +@EqualsAndHashCode(callSuper = true) public class TenantPackagePageDTO extends PageQuery { /** 租户套餐名称 */ diff --git a/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/TenantPageDTO.java b/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/TenantPageDTO.java index 3eae4d840f845f5adb51f7347d63a7c5b0dc4286..8662e785be2a9fcacb458fc2e66d3ef6beaf6eab 100644 --- a/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/TenantPageDTO.java +++ b/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/TenantPageDTO.java @@ -4,6 +4,7 @@ import cn.hutool.core.date.DatePattern; import com.guzi.sherly.model.PageQuery; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; @@ -13,6 +14,7 @@ import java.util.Date; * @date 2022/3/27 */ @Data +@EqualsAndHashCode(callSuper = true) public class TenantPageDTO extends PageQuery { /** 租户代码 */ diff --git a/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/UserPageDTO.java b/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/UserPageDTO.java index da5d9c8f195050e50c74f2b91772bc67b393d040..dd1f25d114109e47375897f92de9b9610cce7a43 100644 --- a/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/UserPageDTO.java +++ b/sherly-sdk/src/main/java/com/guzi/sherly/model/dto/UserPageDTO.java @@ -4,6 +4,7 @@ import cn.hutool.core.date.DatePattern; import com.guzi.sherly.model.PageQuery; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; @@ -14,6 +15,7 @@ import java.util.List; * @date 2022/4/9 */ @Data +@EqualsAndHashCode(callSuper = true) public class UserPageDTO extends PageQuery { /** 昵称 */ @ApiModelProperty(value = "昵称")