Merge remote-tracking branch 'origin/master'

zhanzhiqin

2022-05-16 88b41b938164a5b62ed0a31cd6d8876a2a934776

 ximon-admin/src/main/java/com/sandu/ximon/admin/utils/BroadcastPostUtils.java

@@ -42,6 +42,11 @@
        return result;
    }

    /**
     * @param in
     * @param encoding
     * @return
     */

    public static String streamToString(InputStream in, String encoding) {
        // 将流转换为字符串