Merge branch 'master_bug' into develop

src/views/supply/pickup/components/pickup_form.vue

@@ -548,13 +548,14 @@ export default {
       getDeliverList({ correspondId: this.mainForm.warehouse }).then(res => {
         this.deliverList = res.data
         this.deliverList.forEach(k => {
+          if (this.mainForm.pickupWay == 2 && this.logisticsNumber === '001') {
           this.$set(k, 'warehouseFlag', null)
           if (k.refLinkman || k.refPhone || k.refInstallAddress) {
             this.$set(k, 'warehouseFlag', 1)
           }else{
             this.$set(k, 'warehouseFlag', 0)
-            
           }
+        }
         })
         this.listLoading = false
       })