Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0

mrjackwang

2022-08-02 f93a0d599e1619b46eb0bfcb7ceff74e10e4a3a1

 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;