From 55ce0e34c9183aebe802b91dba88cd54c6eaa48b Mon Sep 17 00:00:00 2001 From: 司猫子 <songshuang@qq.com> Date: 星期日, 04 二月 2024 09:52:19 +0800 Subject: [PATCH] !480 优化单元格合并后多余内容的清除 * excel插件 优化合并策略 在合适的生命周期完成合并 去除被合并单元格的非首行内容 --- ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/UserPassAuthenticator.java | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/UserPassAuthenticator.java b/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/UserPassAuthenticator.java index 52ebd78..fbbe5e3 100644 --- a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/UserPassAuthenticator.java +++ b/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/UserPassAuthenticator.java @@ -11,23 +11,23 @@ */ public class UserPassAuthenticator extends Authenticator { - private final String user; - private final String pass; + private final String user; + private final String pass; - /** - * 鏋勯�� - * - * @param user 鐢ㄦ埛鍚� - * @param pass 瀵嗙爜 - */ - public UserPassAuthenticator(String user, String pass) { - this.user = user; - this.pass = pass; - } + /** + * 鏋勯�� + * + * @param user 鐢ㄦ埛鍚� + * @param pass 瀵嗙爜 + */ + public UserPassAuthenticator(String user, String pass) { + this.user = user; + this.pass = pass; + } - @Override - protected PasswordAuthentication getPasswordAuthentication() { - return new PasswordAuthentication(this.user, this.pass); - } + @Override + protected PasswordAuthentication getPasswordAuthentication() { + return new PasswordAuthentication(this.user, this.pass); + } } -- Gitblit v1.9.3