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-social/src/main/java/org/dromara/common/social/config/properties/SocialProperties.java | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/properties/SocialProperties.java b/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/properties/SocialProperties.java index cb8337b..1487a6a 100644 --- a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/properties/SocialProperties.java +++ b/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/properties/SocialProperties.java @@ -17,18 +17,8 @@ public class SocialProperties { /** - * 鏄惁鍚敤 - */ - private Boolean enabled; - - /** * 鎺堟潈绫诲瀷 */ private Map<String, SocialLoginConfigProperties> type; - - /** - * 鎺堟潈杩囨湡鏃堕棿 - */ - private Long timeout; } -- Gitblit v1.9.3