Merge branch 'master' into test

device-api-service/src/main/java/com/xy/service/DeviceQualityServiceImpl.java

@@ -138,7 +138,7 @@ public class DeviceQualityServiceImpl extends ServiceImpl<DeviceQualityMapper, D
                     Integer memerySpace = deviceSysinfo.getMemerySpace();
                     int memerySpaceSize = SysDictUtils.getValue(EnumDeviceQualityThreshold.Code.CODE.getCode(), EnumDeviceQualityThreshold.MEMERY_SPACE_SIZE.getCode(), Integer.class);
                     if (memerySpace == null || memerySpace < memerySpaceSize) {
-                        return R.fail(deviceSysinfo.getDeviceId() + "内存容量不足" + memerySpaceSize + "G");
+                        return R.fail(deviceSysinfo.getDeviceId() + "内存容量不足" + memerySpaceSize + "M");
                     }
                 }
                 deviceQuality.setQualityAuditUserId(AuthorizeUtils.getLoginId(Long.class));