fix: resolve merge conflicts in .gitignore

mitao

2025-03-19 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/interceptor/MybatisConfiguration.java

New file
@@ -0,0 +1,17 @@
//package com.ruoyi.web.controller.interceptor;
//
//import org.springframework.context.annotation.Bean;
//import org.springframework.context.annotation.Configuration;
//
//@Configuration
//public class MybatisConfiguration {
//
//    /**
//     * 注册拦截器
//     */
//    @Bean
//    public MybatisInterceptor getMybatisInterceptor() {
//        return new MybatisInterceptor();
//    }
//
//}