wezone
/
Ry-master
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

 Conflicts:
	ruoyi/src/main/resources/vm/vue/index.vue.vm
This commit is contained in:
疯狂的狮子li 2020-04-10 13:43:18 +08:00
parent 31a2713012 5ded2569d0
commit 29b131b107
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

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

3
ruoyi/src/main/resources/vm/vue/index-tree.vue.vm
View File

@ -227,8 +227,7 @@ export default {
#end
#if(${column.dictType} != '')
// $comment字典
${column.javaField}Options: []#if($velocityCount != $columns.size()),#end
${column.javaField}Options: [],
#end
#end
// 查询参数

3
ruoyi/src/main/resources/vm/vue/index.vue.vm
View File

@ -258,8 +258,7 @@ export default {
#end
#if(${column.dictType} != '')
// $comment字典
${column.javaField}Options: []#if($velocityCount != $columns.size()),#end
${column.javaField}Options: [],
#end
#end
// 查询参数