Merge remote-tracking branch 'origin/master'

疯狂的狮子li

2021-06-01 7437092765626a31ba440d63d87ea4b9c74b0993

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

@@ -32,6 +32,7 @@
    */
    TableDataInfo<${ClassName}Vo> queryPageList(${ClassName}QueryBo bo);
#end

   /**
    * 查询列表
    */