Merge branch 'dev' into pre-production

src/views/mail/reservation/list.vue

@@ -1365,10 +1365,10 @@ export default {
       //   this.query.reservationStatus = '1';
       // }
       let query = this.queryB;
-      query.reservationStatus = '2';
+      query.reservationStatus = '20';
       if (this.activename === 'nocheck') {
         query = this.queryA;
-        query.reservationStatus = this.queryA.reservationStatus || '1';
+        query.reservationStatus= '10';
       }
       // if (this.queryA.reservationStatus)
       getReservationList(page.currentPage, page.pageSize, Object.assign(params, query)).then(res => {