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

疯狂的狮子li

2020-11-18 ff563c44e257c5921ec6d4647b590d7455edeeb5

 ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java

@@ -74,6 +74,9 @@
    /** 日期控件 */
    public static final String HTML_DATETIME = "datetime";

    /** 上传控件 */
    public static final String HTML_UPLOAD_IMAGE = "uploadImage";

    /** 富文本控件 */
    public static final String HTML_EDITOR = "editor";