Merge branch 'dev'

ageerle

2025-04-21 69efc3261e6f6e4dca268fb2de9866d8f2a14952

 ruoyi-modules/ruoyi-generator/src/main/java/org/ruoyi/generator/mapper/GenTableColumnMapper.java

@@ -2,7 +2,7 @@

import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
import org.ruoyi.generator.domain.GenTableColumn;
import org.ruoyi.common.mybatis.core.mapper.BaseMapperPlus;
import org.ruoyi.core.mapper.BaseMapperPlus;

import java.util.List;