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/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