Merge branch 'feat' into develop

src/views/basic_data/dealer/components/dealer_list-detail.vue

@@ -385,6 +385,7 @@ export default {
         pickCategory: this.pickCategory.join(',')
       }).then(res => {
         this.$successMsg('保存成功')
+        this.$parent.isShow = true
       })
     }
   }

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

@@ -463,10 +463,10 @@ export default {
       companyList: [],
       logisticsNumber: '',
       storeList: [
-        // {
-        //   label: '前置仓',
-        //   value: 0
-        // },
+        {
+          label: '前置仓',
+          value: 0
+        },
         {
           label: '工程机',
           value: 1