From 48509d6488942b98fd92582031b256c2d642896e Mon Sep 17 00:00:00 2001 From: RuoYi Date: Wed, 8 Apr 2020 14:22:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E7=BE=A4?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0d0985688..9a5bb9314 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 From 5ded2569d04a671c85bb7869966ebb3aa61cf5b0 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Fri, 10 Apr 2020 11:49:08 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=94=9F=E6=88=90=E5=A6=82=E6=9E=9C=E9=80=89=E6=8B=A9=E5=AD=97?= =?UTF-8?q?=E5=85=B8=E7=B1=BB=E5=9E=8B=E7=BC=BA=E5=A4=B1=E9=80=97=E5=8F=B7?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi/src/main/resources/vm/vue/index-tree.vue.vm | 3 +-- ruoyi/src/main/resources/vm/vue/index.vue.vm | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) 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 280417a32..5a0d37d67 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 @@ export default { #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 3110a169a..1ee0d7f85 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 @@ export default { #end #if(${column.dictType} != '') // $comment字典 - ${column.javaField}Options: []#if($velocityCount != $columns.size()),#end - + ${column.javaField}Options: [], #end #end // 查询参数