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/PlayBackResult.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/bean/PlayBackResult.java b/src/main/java/com/genersoft/iot/vmp/service/bean/PlayBackResult.java
index 10a2759..8029b5a 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/bean/PlayBackResult.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/bean/PlayBackResult.java
@@ -7,9 +7,9 @@
import javax.sip.RequestEvent;
public class PlayBackResult<T> {
- private int code;
- private T data;
- private MediaServerItem mediaServerItem;
+ private int code;
+ private T data;
+ private MediaServerItem mediaServerItem;
private JSONObject response;
private SipSubscribe.EventResult event;
--
Gitblit v1.8.0