Merge remote-tracking branch 'origin/master'

ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index.vue.vm

@@ -211,13 +211,13 @@ const queryParams = reactive({
 #foreach ($column in $columns)
 #if($column.query)
 #if($column.htmlType == "checkbox")
-  $column.javaField: []#if($foreach.count != $columns.size()),#end
+  $column.javaField: [],
 #elseif($column.javaType == "String")
-  $column.javaField: ''#if($foreach.count != $columns.size()),#end
+  $column.javaField: '',
 #elseif($column.javaType == "Integer" || $column.javaType == "Long")
-  $column.javaField: undefined#if($foreach.count != $columns.size()),#end
+  $column.javaField: undefined,
 #else
-  $column.javaField: undefined#if($foreach.count != $columns.size()),#end
+  $column.javaField: undefined,
 #end
 #end
 #end