From 20cc8a6d6cf16e97e236a9839406d858861cce3c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 06 八月 2024 13:53:40 +0800
Subject: [PATCH] fix 修复 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