From d739bfa5976e36ced26f906ab16f83c20c8cb27c Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: 星期一, 23 五月 2022 09:44:21 +0800
Subject: [PATCH] 处理冲突
---
src/main/java/com/genersoft/iot/vmp/service/bean/SSRCInfo.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/bean/SSRCInfo.java b/src/main/java/com/genersoft/iot/vmp/service/bean/SSRCInfo.java
index faab1c8..1723bc5 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/bean/SSRCInfo.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/bean/SSRCInfo.java
@@ -4,12 +4,12 @@
private int port;
private String ssrc;
- private String StreamId;
+ private String Stream;
- public SSRCInfo(int port, String ssrc, String streamId) {
+ public SSRCInfo(int port, String ssrc, String stream) {
this.port = port;
this.ssrc = ssrc;
- StreamId = streamId;
+ Stream = stream;
}
public int getPort() {
@@ -28,11 +28,11 @@
this.ssrc = ssrc;
}
- public String getStreamId() {
- return StreamId;
+ public String getStream() {
+ return Stream;
}
- public void setStreamId(String streamId) {
- StreamId = streamId;
+ public void setStream(String stream) {
+ Stream = stream;
}
}
--
Gitblit v1.8.0