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

src/apps/AppMeetingNotice/components/addMeeting.vue

@@ -28,7 +28,7 @@
         <input v-model="form.address" placeholder="请输入" :maxlength="30">
       </div>
       <div class="card">
-        <header><em>*</em>会议内容</header>
+        <header>会议内容</header>
         <textarea v-model="form.content" placeholder="请输入" :maxlength="500"></textarea>
       </div>
 
@@ -224,7 +224,7 @@ export default {
 
         if (!this.form.address) return this.$u.toast("请输入会议地点")
 
-        if (!this.form.content) return this.$u.toast("请输入会议内容")
+        // if (!this.form.content) return this.$u.toast("请输入会议内容")
 
         if (!this.form.attendees.length) return this.$u.toast("请选择参会人")
       }