fix: bug6902合并冲突

src/views/ppt_manage/newVersion/components/catalog/pptContent.vue

@@ -171,7 +171,7 @@ export default {
       }
       this.$store.commit('SET_CHART_INFO_MAP',chartInfoMap)
       this.dataLoading.close();
-      $('.ppt-item').css('background-image',`url(${this.pptBgImage})`);
+      $('.ppt-item').css('background-image',`url(${this.firstPage.CurrentBackgroundImg})`);
     },
     async getpptData(){
       const id = this.pptItem.PptId

src/views/ppt_manage/newVersion/pptEditor.vue

@@ -386,7 +386,11 @@ export default {
   components: {
     IndexItem, ChooseCover, AddFormat, ShapePreview,
     LayerEditTool, DeletePageDialog, ChangeFormatDialog, InsertPageDialog, addMyClassifyDia, InsertCharts, ContextMenu, InsertSemantics,
+<<<<<<< HEAD
     ChooseCoverNew, TitleEditorTool,selectImage, VersionRecord,InsertKnowledge
+=======
+    ChooseCoverNew, TitleEditorTool,selectImage, VersionRecord
+>>>>>>> bug6902
 },
   data() {
     return {