From 90d9cd8ac8d7575d1cbd6e81ff6ed746ee82289f Mon Sep 17 00:00:00 2001
From: xu-bin-bin <34916924+xu-bin-bin@users.noreply.github.com>
Date: 星期二, 17 十月 2023 09:23:45 +0800
Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/vmanager/bean/ResourceInfo.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/bean/ResourceInfo.java b/src/main/java/com/genersoft/iot/vmp/vmanager/bean/ResourceInfo.java
old mode 100644
new mode 100755
index b8d7009..3b0ee0d
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/bean/ResourceInfo.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/bean/ResourceInfo.java
@@ -2,40 +2,40 @@
public class ResourceInfo {
- private ResourceBaceInfo device;
- private ResourceBaceInfo channel;
- private ResourceBaceInfo push;
- private ResourceBaceInfo proxy;
+ private ResourceBaseInfo device;
+ private ResourceBaseInfo channel;
+ private ResourceBaseInfo push;
+ private ResourceBaseInfo proxy;
- public ResourceBaceInfo getDevice() {
+ public ResourceBaseInfo getDevice() {
return device;
}
- public void setDevice(ResourceBaceInfo device) {
+ public void setDevice(ResourceBaseInfo device) {
this.device = device;
}
- public ResourceBaceInfo getChannel() {
+ public ResourceBaseInfo getChannel() {
return channel;
}
- public void setChannel(ResourceBaceInfo channel) {
+ public void setChannel(ResourceBaseInfo channel) {
this.channel = channel;
}
- public ResourceBaceInfo getPush() {
+ public ResourceBaseInfo getPush() {
return push;
}
- public void setPush(ResourceBaceInfo push) {
+ public void setPush(ResourceBaseInfo push) {
this.push = push;
}
- public ResourceBaceInfo getProxy() {
+ public ResourceBaseInfo getProxy() {
return proxy;
}
- public void setProxy(ResourceBaceInfo proxy) {
+ public void setProxy(ResourceBaseInfo proxy) {
this.proxy = proxy;
}
}
--
Gitblit v1.8.0