Merge remote-tracking branch 'origin/master'

fhKeeper/formulahousekeeper/octopus/src/views/customer/list.vue

@@ -747,7 +747,7 @@
                     pageIndex: this.page,
                     pageSize: this.size,
                     companyName: this.keyword,
-                    isMeal: this.isMeal == 2 ? 0 : 1,
+                    isMeal: this.isMeal == 2 ? 0 : this.isMeal,
                     key: this.isMeal == 2 ? 1 : 0
                 },
                 res => {