Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

疯狂的狮子li

2020-04-10 29b131b107a55dc88301f3481fe5de2aff050036

Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue


 Conflicts:

	ruoyi/src/main/resources/vm/vue/index.vue.vm

 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)点击按钮入群。
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)点击按钮入群。

 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

      // 查询参数


 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
      // 查询参数