Merge branch 'dev'

ageerle

2025-04-21 69efc3261e6f6e4dca268fb2de9866d8f2a14952

 ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm

@@ -2,8 +2,8 @@

import org.ruoyi.common.core.utils.MapstructUtils;
    #if($table.crud || $table.sub)
import org.ruoyi.common.mybatis.core.page.TableDataInfo;
import org.ruoyi.common.mybatis.core.page.PageQuery;
import org.ruoyi.core.page.TableDataInfo;
import org.ruoyi.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
#end
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;