Merge branch 'master' of http://1.15.4.62/r/~chenjiahe/hx_common

fhx

2023-11-16 d2d0425c8d1460618f3a4fa6e53eec7228ab89b8

 src/main/java/com/hx/util/FileConvertTool.java

@@ -44,8 +44,7 @@
    /**
     * 获取文件base64字符串
     * @param urlPath  文件路径
     * @return
     * @throws IOException
     * @return 返回base64编码
     */
    public static String getFileBaseStrByUrl(String urlPath) throws IOException {
        InputStream is = getUrlFile(urlPath);