Merge remote-tracking branch 'remotes/origin/develop-2.0.0' into develop-2.0.0-gong

src/components/DialogTagPurchase.vue

@@ -13,7 +13,7 @@
     >
       <el-collapse v-model="activeCollapseName" class="form-collapse">
         <el-collapse-item title="采购信息" name="1" class="form-collapse-item">
-          <div class="overflow-auto" style="max-height:300px;">
+          <div class="overflow-auto" style="max-height:300px;padding:0 10px;">
             <el-row :gutter="$$Constant.LAYOUT_GAP">
               <el-col :span="12">
                 <el-form-item label="标签供应商" prop="provider">