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-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java b/ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java index 44eaece..a75b913 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java @@ -18,6 +18,11 @@ /** * 鐧诲綍 + * + * @param body 鐧诲綍瀵硅薄 + * @param client 鎺堟潈绠$悊瑙嗗浘瀵硅薄 + * @param grantType 鎺堟潈绫诲瀷 + * @return 鐧诲綍楠岃瘉淇℃伅 */ static LoginVo login(String body, SysClientVo client, String grantType) { // 鎺堟潈绫诲瀷鍜屽鎴风id @@ -31,6 +36,10 @@ /** * 鐧诲綍 + * + * @param body 鐧诲綍瀵硅薄 + * @param client 鎺堟潈绠$悊瑙嗗浘瀵硅薄 + * @return 鐧诲綍楠岃瘉淇℃伅 */ LoginVo login(String body, SysClientVo client); -- Gitblit v1.9.3