Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

疯狂的狮子li

2021-09-06 ab4b75fe30f9a3cf08e3ced667c3ec8c711ca939

 ruoyi-generator/src/main/resources/vm/vue/index.vue.vm

@@ -367,7 +367,6 @@
      queryParams: {
        pageNum: 1,
        pageSize: 10,
        reasonable: true,
#foreach ($column in $columns)
#if($column.query)
        $column.javaField: undefined#if($velocityCount != $columns.size()),#end