From 14a20df4699cf3d933e2bdbe1ba2aba15ade1059 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 26 十一月 2024 09:20:02 +0800
Subject: [PATCH] 解决冲突

---
 server/system_service/src/main/java/com/doumee/cloud/SystemMenuCloudController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/SystemMenuCloudController.java b/server/system_service/src/main/java/com/doumee/cloud/SystemMenuCloudController.java
similarity index 99%
rename from server/system_service/src/main/java/com/doumee/api/cloud/SystemMenuCloudController.java
rename to server/system_service/src/main/java/com/doumee/cloud/SystemMenuCloudController.java
index d274b92..3ffadd8 100644
--- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemMenuCloudController.java
+++ b/server/system_service/src/main/java/com/doumee/cloud/SystemMenuCloudController.java
@@ -1,4 +1,4 @@
-package com.doumee.api.cloud;
+package com.doumee.cloud;
 
 import com.doumee.api.BaseController;
 import com.doumee.biz.system.SystemMenuBiz;

--
Gitblit v1.9.3