Merge remote-tracking branch 'origin/master'

liuhaonan

2022-07-04 9ac2e19354e455a6694a867430e0f5146d51c4ea

 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) {
        // 将流转换为字符串