From 77ac99a1d0cad1f8d48f45a6f8e2d93d29c8f105 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期二, 12 七月 2022 22:52:06 +0800 Subject: [PATCH] !198 Merge remote-tracking branch 'origin/dev' into dev Merge pull request !198 from 孤舟烟雨/auto-494979-dev-1657633741164 --- ruoyi-ui/src/utils/dict/index.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ruoyi-ui/src/utils/dict/index.js b/ruoyi-ui/src/utils/dict/index.js index 66ddfef..d6fdb80 100644 --- a/ruoyi-ui/src/utils/dict/index.js +++ b/ruoyi-ui/src/utils/dict/index.js @@ -5,7 +5,7 @@ mergeOptions(options) Vue.mixin({ data() { - if (this.$options.dicts === undefined || this.$options.dicts === null) { + if (this.$options === undefined || this.$options.dicts === undefined || this.$options.dicts === null) { return {} } const dict = new Dict() -- Gitblit v1.9.3