feat auto update sdk

bytestarter · bytestarter · commit c11accd9f78c · 2025-08-14T20:26:40.000+08:00
diff --git a/volc-sdk-java/src/main/java/com/volcengine/service/livesaas/LivesaasService.java b/volc-sdk-java/src/main/java/com/volcengine/service/livesaas/LivesaasService.java
@@ -2674,8 +2674,6 @@ public interface LivesaasService extends IBaseService {
      */
     GetMergedReportResponse getMergedReport(GetMergedReportRequest getMergedReportRequest) throws Exception;
 
-<<<<<<< HEAD
-
     /**
      * updateViewerLevelConfig
      * @param updateViewerLevelConfigRequest UpdateViewerLevelConfigRequest
diff --git a/volc-sdk-java/src/main/java/com/volcengine/service/livesaas/impl/LivesaasServiceImpl.java b/volc-sdk-java/src/main/java/com/volcengine/service/livesaas/impl/LivesaasServiceImpl.java
@@ -4705,7 +4705,6 @@ public GetMergedReportResponse getMergedReport(GetMergedReportRequest getMergedR
         res.getResponseMetadata().setService("livesaas");
         return res;
     }
-<<<<<<< HEAD
     @Override
     public UpdateViewerLevelConfigResponse updateViewerLevelConfig(UpdateViewerLevelConfigRequest updateViewerLevelConfigRequest) throws Exception {
         RawResponse response = json(Const.UpdateViewerLevelConfig, new ArrayList<>(), JSON.toJSONString(updateViewerLevelConfigRequest));

Original file line number	Diff line number	Diff line change
`@@ -4705,7 +4705,6 @@ public GetMergedReportResponse getMergedReport(GetMergedReportRequest getMergedR`
`4705`	`4705`	`res.getResponseMetadata().setService("livesaas");`
`4706`	`4706`	`return res;`
`4707`	`4707`	`}`
`4708`		`-<<<<<<< HEAD`
`4709`	`4708`	`@Override`
`4710`	`4709`	`public UpdateViewerLevelConfigResponse updateViewerLevelConfig(UpdateViewerLevelConfigRequest updateViewerLevelConfigRequest) throws Exception {`
`4711`	`4710`	`RawResponse response = json(Const.UpdateViewerLevelConfig, new ArrayList<>(), JSON.toJSONString(updateViewerLevelConfigRequest));`