Merge branch 'yh319' into debug

src/views/ppt_manage/newVersion/components/selectImage.vue

@@ -145,10 +145,8 @@ export default {
             this.showDialog = true
             this.imgType = type
             this.keyword = ''
-            if (type != 3) {
-                this.momentChooseId = id
-                this.momentChooseUrl = url
-            }
+            this.momentChooseId = id
+            this.momentChooseUrl = url
             this.handleSearch()
         },
         // 关闭弹窗