From aff3fa0de93fccd4851ca378c3840acb2b572375 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 04 十二月 2024 17:06:58 +0800
Subject: [PATCH] Merge branch '1.5.0' of http://59.41.255.150:6688/r/~wjc/HDLPhotovoltaicDebugAPP into 1.5.0
---
app/src/main/java/com/hdl/photovoltaic/bean/ModBusBean.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/bean/ModBusBean.java b/app/src/main/java/com/hdl/photovoltaic/bean/ModBusBean.java
index fed6b01..2a6962a 100644
--- a/app/src/main/java/com/hdl/photovoltaic/bean/ModBusBean.java
+++ b/app/src/main/java/com/hdl/photovoltaic/bean/ModBusBean.java
@@ -7,15 +7,15 @@
*/
public class ModBusBean implements Serializable {
- private String oid;//缃戝叧oid
+ private String mac;//缃戝叧oid
private byte []data;//鎺у埗鍛戒护
- public String getOid() {
- return oid;
+ public String getMac() {
+ return mac;
}
- public void setOid(String oid) {
- this.oid = oid;
+ public void setMac(String mac) {
+ this.mac = mac;
}
public byte []getData() {
--
Gitblit v1.8.0