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

 Conflicts:

	ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java

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

	ruoyi-ui/src/permission.js

	ruoyi-ui/src/store/modules/user.js

	ruoyi-ui/src/views/monitor/logininfor/index.vue

	ruoyi-ui/src/views/monitor/operlog/index.vue

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

@@ -26,6 +26,11 @@ export default {
       type: Number,
       default: null,
     },
+    /* 只读 */
+    readOnly: {
+      type: Boolean,
+      default: false,
+    }
   },
   data() {
     return {
@@ -51,7 +56,7 @@ export default {
           ],
         },
         placeholder: "请输入内容",
-        readOnly: false,
+        readOnly: this.readOnly,
       },
     };
   },