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/TSysConfigService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TSysConfigService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TSysConfigService.java
index 43cfc9d..041b616 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TSysConfigService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TSysConfigService.java
@@ -1,7 +1,7 @@
 package com.ruoyi.system.service;
 
-import com.ruoyi.system.model.TSysConfig;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.system.model.TSysConfig;
 
 /**
  * <p>

--
Gitblit v1.7.1