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/bo/SysSocialBo.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java index d3b32e0..7784271 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java @@ -57,9 +57,8 @@ private String refreshToken; /** - * 鐢ㄦ埛鐨� open id + * 骞冲彴鍞竴id */ - @NotBlank(message = "鐢ㄦ埛鐨� open id涓嶈兘涓虹┖", groups = { AddGroup.class, EditGroup.class }) private String openId; /** @@ -139,4 +138,5 @@ private String oauthTokenSecret; + } -- Gitblit v1.9.3