From 83905db7170ea5981949e0f4b56695fb4ee02c83 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 13 七月 2021 13:50:21 +0800
Subject: [PATCH] !69 同步dev分支 Merge pull request !69 from 疯狂的狮子Li/dev
---
ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
index cedab30..30489e0 100644
--- a/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
+++ b/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
@@ -285,7 +285,7 @@
#else
#set($comment=$column.columnComment)
#end
-#if(${column.dictType} != '')
+#if(${column.dictType} && ${column.dictType} != '')
// $comment瀛楀吀
${column.javaField}Options: [],
#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
@@ -327,7 +327,7 @@
created() {
this.getList();
#foreach ($column in $columns)
-#if(${column.dictType} != '')
+#if(${column.dictType} && ${column.dictType} != '')
this.getDicts("${column.dictType}").then(response => {
this.${column.javaField}Options = response.data;
});
@@ -379,7 +379,7 @@
});
},
#foreach ($column in $columns)
-#if(${column.dictType} != '')
+#if(${column.dictType} && ${column.dictType} != '')
#set($parentheseIndex=$column.columnComment.indexOf("锛�"))
#if($parentheseIndex != -1)
#set($comment=$column.columnComment.substring(0, $parentheseIndex))
--
Gitblit v1.9.3