From 70bf1a48d037f993021ddf4ee2ee6da3bbce351e Mon Sep 17 00:00:00 2001 From: 司猫子 <songshuang@qq.com> Date: 星期日, 04 二月 2024 09:51:52 +0800 Subject: [PATCH] !481 单元格合并可以基于注解选择哪些其他字段需要同时相等方可进行该单元格合并 * excel插件 原有的合并策略写死了根据前一字段是否一致来判断后一字段的合并 感觉这样不灵活 如有特殊需求 字段排序不规整 于是扩充了注解的… --- ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserPasswordBo.java | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserPasswordBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserPasswordBo.java index 298ea3a..8615fcd 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserPasswordBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserPasswordBo.java @@ -2,7 +2,6 @@ import jakarta.validation.constraints.NotBlank; import lombok.Data; -import org.dromara.common.core.validate.auth.PasswordGroup; import java.io.Serial; import java.io.Serializable; @@ -19,12 +18,12 @@ /** * 鏃у瘑鐮� */ - @NotBlank(message = "鏃у瘑鐮佷笉鑳戒负绌�", groups = { PasswordGroup.class }) + @NotBlank(message = "鏃у瘑鐮佷笉鑳戒负绌�") private String oldPassword; /** * 鏂板瘑鐮� */ - @NotBlank(message = "鏂板瘑鐮佷笉鑳戒负绌�", groups = { PasswordGroup.class }) + @NotBlank(message = "鏂板瘑鐮佷笉鑳戒负绌�") private String newPassword; } -- Gitblit v1.9.3