jiangyc/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-24 07:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
 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
Download Patch File Download Diff File Expand all files Collapse all files

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