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

疯狂的狮子li

2021-03-30 fdacc0458289e54367b623d65452aefc4b6a5759

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


 Conflicts:

	ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java

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

 ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java

@@ -38,12 +38,9 @@
    @Override

    public ServletInputStream getInputStream() throws IOException

    {



        final ByteArrayInputStream bais = new ByteArrayInputStream(body);



        return new ServletInputStream()

        {



            @Override

            public int read() throws IOException

            {

@@ -51,6 +48,12 @@
            }



            @Override

            public int available() throws IOException

            {

                return body.length;

            }



            @Override

            public boolean isFinished()

            {

                return false;


 ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java

@@ -201,6 +201,10 @@
            {

                // 从第2行开始取数据,默认第一行是表头.

                Row row = sheet.getRow(i);

                if(row == null)

                {

                    continue;

                }

                T entity = null;

                for (Map.Entry<Integer, Field> entry : fieldsMap.entrySet())

                {