Merge remote-tracking branch 'origin/dev' into satoken

疯狂的狮子li

2021-12-27 dd37247e65374dd4ef7e8e8b9212d8f29023e301

 ruoyi-generator/src/main/resources/vm/java/service.java.vm

@@ -6,6 +6,7 @@
import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
#if($table.crud || $table.sub)
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.PageQuery;
#end

import java.util.Collection;
@@ -28,7 +29,7 @@
   /**
    * 查询列表
    */
    TableDataInfo<${ClassName}Vo> queryPageList(${ClassName}Bo bo);
    TableDataInfo<${ClassName}Vo> queryPageList(${ClassName}Bo bo, PageQuery pageQuery);
#end

   /**