From d0aa35e47ee48325cd43d0729e4ec82bdea23f7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Mon, 4 Sep 2023 09:43:47 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E9=A1=B5=E9=9D=A2=E5=8F=82=E6=95=B0=E7=BC=BA?=
 =?UTF-8?q?=E5=B0=91=E9=80=97=E5=8F=B7=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/vm/vue/index-tree.vue.vm    | 18 +++++++++---------
 .../src/main/resources/vm/vue/index.vue.vm     | 18 +++++++++---------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
index 59ac41b96..38b470adc 100644
--- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
+++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
@@ -322,19 +322,19 @@ const data = reactive<PageData<${BusinessName}Form, ${BusinessName}Query>>({
   queryParams: {
 #foreach ($column in $columns)
 #if($column.query)
-    #if($column.htmlType != "datetime" || $column.queryType != "BETWEEN")
-    $column.javaField: undefined#if($foreach.count != $columns.size()),#end
-    #end
+#if($column.htmlType != "datetime" || $column.queryType != "BETWEEN")
+    $column.javaField: undefined,
+#end
 #end
 #end
     params: {
-      #foreach ($column in $columns)
-      #if($column.query)
-      #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+#foreach ($column in $columns)
+#if($column.query)
+#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
       $column.javaField: undefined#if($foreach.count != $columns.size()),#end
-      #end
-      #end
-      #end
+#end
+#end
+#end
     }
   },
   rules: {
diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
index 4bc1e6bfc..f872149c7 100644
--- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
+++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
@@ -308,19 +308,19 @@ const data = reactive<PageData<${BusinessName}Form, ${BusinessName}Query>>({
     pageSize: 10,
 #foreach ($column in $columns)
 #if($column.query)
-    #if($column.htmlType != "datetime" || $column.queryType != "BETWEEN")
-    $column.javaField: undefined#if($foreach.count != $columns.size()),#end
-    #end
+#if($column.htmlType != "datetime" || $column.queryType != "BETWEEN")
+    $column.javaField: undefined,
+#end
 #end
 #end
     params: {
-    #foreach ($column in $columns)
-    #if($column.query)
-        #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+#foreach ($column in $columns)
+#if($column.query)
+#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
       $column.javaField: undefined#if($foreach.count != $columns.size()),#end
-        #end
-    #end
-    #end
+#end
+#end
+#end
     }
   },
   rules: {