Merge remote-tracking branch 'origin/dev' into dev

疯狂的狮子li

2021-07-12 fdad98b321bec5d6fbb97ae1a2a1939708fa703f

 ruoyi-ui/src/components/Editor/index.vue

@@ -49,7 +49,7 @@
    /* 类型（base64格式、url格式） */
    type: {
      type: String,
      default: "",
      default: "url",
    }
  },
  data() {