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

疯狂的狮子li

2020-07-17 a53a3b3119659d6ec28b458dcefd46f4ec49d55c

 ruoyi/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java

@@ -144,7 +144,7 @@

    public static void main(String[] args)
    {
        String html = "<script>alert(1);</script>";
        String html = "alert('11111');";
        System.out.println(EscapeUtil.clean(html));
        System.out.println(EscapeUtil.escape(html));
        System.out.println(EscapeUtil.unescape(html));