Merge remote-tracking branch 'origin/master'

This commit is contained in:
wr
2025-03-26 11:09:32 +08:00

View File

@@ -1838,11 +1838,11 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
private String dealVoltageLevel(String voltage) {
float scale = Float.parseFloat(voltage.substring(0, voltage.indexOf("kV")));
if (scale < 500) {
//if (scale < 500) {
return "交流" + voltage;
} else {
return "直流" + voltage;
}
//} else {
// return "直流" + voltage;
//}
}