Merge remote-tracking branch 'origin/master'

fwq

2023-12-11 43d11becdfc0d7af00b10e91b962cd0c4738bbf1

 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);