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

疯狂的狮子li

2021-09-14 662251e208e58a9940efb200457c49ed342cd06f

 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