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-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysSocial.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysSocial.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysSocial.java
index fa9cb9f..10f2936 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysSocial.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysSocial.java
@@ -28,6 +28,11 @@
private Long id;
/**
+ * 鐢ㄦ埛ID
+ */
+ private Long userId;
+
+ /**
* 鐨勫敮涓�ID
*/
private String authId;
@@ -56,11 +61,6 @@
* 鐢ㄦ埛鐨� open id
*/
private String openId;
-
- /**
- * 鐢ㄦ埛鐨� ID
- */
- private Long userId;
/**
* 鎺堟潈鐨勭涓夋柟璐﹀彿
--
Gitblit v1.9.3