Merge remote-tracking branch 'origin/master' into master

src/api/meeting/meeting.js

@@ -282,3 +282,16 @@ export function exportOutMeetingNotice(id){
     responseType: 'blob',
   })
 }
+
+/**
+ * 编辑会议基础信息
+ * @param data
+ * @returns {*}
+ */
+export function editMeeting(data){
+  return request({
+    url: '/meeting/editMeeting',
+    method: 'post',
+    data: data
+  })
+}