Merge branch 'master' of http://192.168.89.173/rays/pcloud-common-parent.git

pcloud-common-core/src/main/java/com/pcloud/common/core/dto/dubbing/DubbingDTO.java

@@ -29,6 +29,16 @@ public class DubbingDTO implements Serializable {
 	private String[] bgms;
 
 	/**
+	 * 录音文件地址
+	 */
+	private String soundUrl;
+
+	/**
+	 * 来源类型
+	 */
+	private String fromType;
+
+	/**
 	 * 导语
 	 */
 	private String beforeText;
@@ -53,6 +63,22 @@ public class DubbingDTO implements Serializable {
 	 */
 	private Long musicId;
 
+	public String getSoundUrl() {
+		return soundUrl;
+	}
+
+	public void setSoundUrl(String soundUrl) {
+		this.soundUrl = soundUrl;
+	}
+
+	public String getFromType() {
+		return fromType;
+	}
+
+	public void setFromType(String fromType) {
+		this.fromType = fromType;
+	}
+
 	public String getBeforeText() {
 		return beforeText;
 	}

pcloud-common-core/src/main/java/com/pcloud/common/core/dto/dubbing/DubbingResultDTO.java

@@ -20,6 +20,11 @@ public class DubbingResultDTO implements Serializable {
 	private static final long serialVersionUID = 2458000180158610651L;
 
 	/**
+	 * 来源类型
+	 */
+	private String fromType;
+
+	/**
 	 * 语音文件
 	 */
 	private List<AudioDTO> speechs;
@@ -44,6 +49,14 @@ public class DubbingResultDTO implements Serializable {
 	 */
 	private Long musicId;
 
+	public String getFromType() {
+		return fromType;
+	}
+
+	public void setFromType(String fromType) {
+		this.fromType = fromType;
+	}
+
 	public Long getAppId() {
 		return appId;
 	}