Merge branch 'wvp-28181-2.0' of https://github.com/ixingqiao/wvp-GB28181-pr...

xingqiao

2022-08-26 fa0660291055ec113f9982270c27ebc45bec16ce

 src/main/java/com/genersoft/iot/vmp/utils/SystemInfoUtils.java

@@ -8,7 +8,6 @@
import oshi.software.os.OperatingSystem;
import oshi.util.FormatUtil;

import java.text.DecimalFormat;
import java.util.HashMap;
import java.util.List;
import java.util.Map;