From 663e22ac294acf7a26ab2307b04ddd24700fd88b Mon Sep 17 00:00:00 2001
From: Simple <2424585654@qq.com>
Date: 星期二, 12 十二月 2023 16:58:24 +0800
Subject: [PATCH] fix 修复 excel合并注解会根据第一合并列的结果来决定后续的列合并
---
ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/properties/SocialProperties.java | 5 -----
1 files changed, 0 insertions(+), 5 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..1beb7d0 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
@@ -26,9 +26,4 @@
*/
private Map<String, SocialLoginConfigProperties> type;
- /**
- * 鎺堟潈杩囨湡鏃堕棿
- */
- private Long timeout;
-
}
--
Gitblit v1.9.3