controller2admin

.idea/workspace.xml

@@ -4,7 +4,15 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="46b159bd-08ca-42f0-b80f-41d4944a8a29" name="Changes" comment="refined" />
+    <list default="true" id="46b159bd-08ca-42f0-b80f-41d4944a8a29" name="Changes" comment="refined">
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/om/controller/user/ApproveAccountController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/om/controller/admin/ApproveAccountController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/om/controller/user/DepartmentController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/om/controller/admin/DepartmentController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/om/controller/user/DictController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/om/controller/admin/DictController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/om/controller/user/EmployeeController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/om/controller/admin/EmployeeController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/om/controller/user/MenuController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/om/controller/admin/MenuController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/om/controller/user/RoleController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/om/controller/admin/RoleController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/om/controller/user/RoleMenuController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/om/controller/admin/RoleMenuController.java" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -179,7 +187,7 @@
       <workItem from="1707438514767" duration="8903000" />
       <workItem from="1708670527995" duration="3132000" />
       <workItem from="1708916949997" duration="4355000" />
-      <workItem from="1708925853376" duration="14747000" />
+      <workItem from="1708925853376" duration="15000000" />
     </task>
     <task id="LOCAL-00001" summary="管理员登录">
       <option name="closed" value="true" />
@@ -267,7 +275,15 @@
       <option name="project" value="LOCAL" />
       <updated>1708943025018</updated>
     </task>
-    <option name="localTasksCounter" value="12" />
+    <task id="LOCAL-00012" summary="refined">
+      <option name="closed" value="true" />
+      <created>1708944825375</created>
+      <option name="number" value="00012" />
+      <option name="presentableId" value="LOCAL-00012" />
+      <option name="project" value="LOCAL" />
+      <updated>1708944825375</updated>
+    </task>
+    <option name="localTasksCounter" value="13" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

src/main/java/com/om/controller/user/ApproveAccountController.java → src/main/java/com/om/controller/admin/ApproveAccountController.java

@@ -1,4 +1,4 @@
-package com.om.controller.user;
+package com.om.controller.admin;
 
 import com.om.service.IEmployeeService;
 import com.om.utils.Result;

src/main/java/com/om/controller/user/DepartmentController.java → src/main/java/com/om/controller/admin/DepartmentController.java

@@ -1,4 +1,4 @@
-package com.om.controller.user;
+package com.om.controller.admin;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

src/main/java/com/om/controller/user/DictController.java → src/main/java/com/om/controller/admin/DictController.java

@@ -1,4 +1,4 @@
-package com.om.controller.user;
+package com.om.controller.admin;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

src/main/java/com/om/controller/user/EmployeeController.java → src/main/java/com/om/controller/admin/EmployeeController.java

@@ -1,4 +1,4 @@
-package com.om.controller.user;
+package com.om.controller.admin;
 
 import cn.afterturn.easypoi.entity.vo.NormalExcelConstants;
 import cn.afterturn.easypoi.excel.entity.ExportParams;

src/main/java/com/om/controller/user/MenuController.java → src/main/java/com/om/controller/admin/MenuController.java

@@ -1,4 +1,4 @@
-package com.om.controller.user;
+package com.om.controller.admin;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

src/main/java/com/om/controller/user/RoleController.java → src/main/java/com/om/controller/admin/RoleController.java

@@ -1,4 +1,4 @@
-package com.om.controller.user;
+package com.om.controller.admin;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

src/main/java/com/om/controller/user/RoleMenuController.java → src/main/java/com/om/controller/admin/RoleMenuController.java

@@ -1,4 +1,4 @@
-package com.om.controller.user;
+package com.om.controller.admin;
 
 import com.om.service.IRoleMenuService;
 import com.om.service.IRoleService;