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

疯狂的狮子li

2020-07-17 a53a3b3119659d6ec28b458dcefd46f4ec49d55c

 ruoyi/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java

@@ -204,7 +204,7 @@
            String ret = "";
            while ((ret = br.readLine()) != null)
            {
                if (ret != null && !ret.trim().equals(""))
                if (ret != null && !"".equals(ret.trim()))
                {
                    result.append(new String(ret.getBytes("ISO-8859-1"), "utf-8"));
                }