XW-AIOT/wvp-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into wvp-28181-2.0

Browse Source 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
This commit is contained in:
panlinlin
2021-01-08 17:31:49 +08:00
parent 675ce2346d 1342aad032
commit 7e581e9d3a
10 changed files with 110 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
View File

@@ -6,7 +6,7 @@ public class StreamInfo {
private String streamId;
private String deviceID;
private String cahnnelId;
private String channelId;
private String flv;
private String ws_flv;
private String fmp4;
@@ -27,12 +27,12 @@ public class StreamInfo {
this.deviceID = deviceID;
}
public String getCahnnelId() {
return cahnnelId;
public String getChannelId() {
return channelId;
}
public void setCahnnelId(String cahnnelId) {
this.cahnnelId = cahnnelId;
public void setChannelId(String channelId) {
this.channelId = channelId;
}
public String getFlv() {