From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/TDeptService.java |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TDeptService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TDeptService.java
index 19151fd..6da81ba 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TDeptService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TDeptService.java
@@ -1,9 +1,6 @@
 package com.ruoyi.system.service;
 
 import com.ruoyi.common.basic.PageInfo;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.system.dto.SysSourcesListDTO;
-import com.ruoyi.system.dto.TDeptUpAndDownDTO;
 import com.ruoyi.system.model.TDept;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.system.query.TDeptQuery;

--
Gitblit v1.7.1