From 29b131b107a55dc88301f3481fe5de2aff050036 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 10 四月 2020 13:43:18 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

---
 ruoyi/src/main/resources/vm/vue/index.vue.vm      |    3 +--
 ruoyi/src/main/resources/vm/vue/index-tree.vue.vm |    3 +--
 README.md                                         |    2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 0d09856..9a5bb93 100644
--- a/README.md
+++ b/README.md
@@ -81,4 +81,4 @@
 
 ## 鑻ヤ緷鍓嶅悗绔垎绂讳氦娴佺兢
 
-QQ缇わ細 [![鍔犲叆QQ缇(https://img.shields.io/badge/宸叉弧-937441-blue.svg)](https://jq.qq.com/?_wv=1027&k=5bVB1og) [![鍔犲叆QQ缇(https://img.shields.io/badge/887144332-blue.svg)](https://jq.qq.com/?_wv=1027&k=5eiA4DH)鐐瑰嚮鎸夐挳鍏ョ兢銆�
\ No newline at end of file
+QQ缇わ細 [![鍔犲叆QQ缇(https://img.shields.io/badge/宸叉弧-937441-blue.svg)](https://jq.qq.com/?_wv=1027&k=5bVB1og) [![鍔犲叆QQ缇(https://img.shields.io/badge/宸叉弧-887144332-blue.svg)](https://jq.qq.com/?_wv=1027&k=5eiA4DH) [![鍔犲叆QQ缇(https://img.shields.io/badge/180251782-blue.svg)](https://jq.qq.com/?_wv=1027&k=5AxMKlC)鐐瑰嚮鎸夐挳鍏ョ兢銆�
\ No newline at end of file
diff --git a/ruoyi/src/main/resources/vm/vue/index-tree.vue.vm b/ruoyi/src/main/resources/vm/vue/index-tree.vue.vm
index 280417a..5a0d37d 100644
--- a/ruoyi/src/main/resources/vm/vue/index-tree.vue.vm
+++ b/ruoyi/src/main/resources/vm/vue/index-tree.vue.vm
@@ -227,8 +227,7 @@
 #end
 #if(${column.dictType} != '')
       // $comment瀛楀吀
-      ${column.javaField}Options: []#if($velocityCount != $columns.size()),#end
-
+      ${column.javaField}Options: [],
 #end
 #end
       // 鏌ヨ鍙傛暟
diff --git a/ruoyi/src/main/resources/vm/vue/index.vue.vm b/ruoyi/src/main/resources/vm/vue/index.vue.vm
index c78a6ac..5b52260 100644
--- a/ruoyi/src/main/resources/vm/vue/index.vue.vm
+++ b/ruoyi/src/main/resources/vm/vue/index.vue.vm
@@ -258,8 +258,7 @@
 #end
 #if(${column.dictType} != '')
       // $comment瀛楀吀
-      ${column.javaField}Options: []#if($velocityCount != $columns.size()),#end
-
+      ${column.javaField}Options: [],
 #end
 #end
       // 鏌ヨ鍙傛暟

--
Gitblit v1.9.3