Merge branch 'dev' into release_beta/1.0.0

app.json

@@ -17,4 +17,4 @@
     "allowsBounceVertical": "YES"
   },
   "pullRefresh": false
-}
+}
\ No newline at end of file

pages/meetingDetail/meetingDetail.js

@@ -767,6 +767,8 @@ create.Page({
             this.$store.data.indexNeedUpdate = true
             this.update()
             this.setData({
+              aheadTimes: [15],
+              'comListData.aheadTimesListId': [15],
               confirmAttendance: 1
             })
             this.conflictPeople()
@@ -1239,6 +1241,8 @@ create.Page({
           this.$store.data.indexNeedUpdate = true
           this.update()
           this.setData({
+            aheadTimes: [15],
+            'comListData.aheadTimesListId': [15],
             confirmAttendance: 1
           })
           this.conflictPeople()