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/ui/bean/OidBean.java | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/bean/OidBean.java b/app/src/main/java/com/hdl/photovoltaic/ui/bean/OidBean.java
index f00ddf1..842ea99 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/bean/OidBean.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/bean/OidBean.java
@@ -22,7 +22,6 @@
private String device_mac;//鏈湴鐨刴ac
private List<ImageInfo> image_info;
-
public String getDriver_code() {
return driver_code == null ? "" : driver_code;
}
@@ -70,7 +69,6 @@
public void setDevice_mac(String device_mac) {
this.device_mac = device_mac;
}
-
@@ -169,4 +167,4 @@
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0