From 2bc156ec08369884b44961cd446201d35a66fff0 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 25 六月 2024 10:50:40 +0800
Subject: [PATCH] Merge branch 'feature/v1.4.1' of http://59.41.255.150:6688/r/~wjc/HDLPhotovoltaicDebugAPP into feature/v1.4.1
---
app/src/main/java/com/hdl/photovoltaic/enums/PowerStationStatus.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/enums/PowerStationStatus.java b/app/src/main/java/com/hdl/photovoltaic/enums/PowerStationStatus.java
index 9ede726..bfed333 100644
--- a/app/src/main/java/com/hdl/photovoltaic/enums/PowerStationStatus.java
+++ b/app/src/main/java/com/hdl/photovoltaic/enums/PowerStationStatus.java
@@ -6,5 +6,5 @@
String off = "2";//绂荤嚎
String connecting = "3";//杩炴帴涓�(寰呮帴鍏�)
String malfunction = "4";//鏁呴殰
- String off_malfunction = "4";//绂荤嚎鏈夋晠闅�
+ String off_malfunction = "5";//绂荤嚎鏈夋晠闅�
}
--
Gitblit v1.8.0