From 71a2a8245db4c04be3f96a9eb9b47931d3130650 Mon Sep 17 00:00:00 2001 From: zlyx <1242874891@qq.com> Date: 星期三, 18 一月 2023 17:09:43 +0800 Subject: [PATCH] refactor 重构 common, framework 包结构, 参照 cloud 版本拆分子模块 ; update 更新模块包名 ; delete 移除 sms 模块, oss 模块, framework 模块 (并入 common 模块) ; --- ruoyi-common/ruoyi-common-excel/src/main/java/com/ruoyi/common/excel/annotation/CellMerge.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/CellMerge.java b/ruoyi-common/ruoyi-common-excel/src/main/java/com/ruoyi/common/excel/annotation/CellMerge.java similarity index 76% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/CellMerge.java rename to ruoyi-common/ruoyi-common-excel/src/main/java/com/ruoyi/common/excel/annotation/CellMerge.java index 4af822e..5c0f552 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/CellMerge.java +++ b/ruoyi-common/ruoyi-common-excel/src/main/java/com/ruoyi/common/excel/annotation/CellMerge.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.annotation; +package com.ruoyi.common.excel.annotation; -import com.ruoyi.common.excel.CellMergeStrategy; +import com.ruoyi.common.excel.core.CellMergeStrategy; import java.lang.annotation.*; -- Gitblit v1.9.3