Merge branch 'dev' into 'test'

商品提货订单批量发货按钮样式调整

See merge request quanshu/mp-ui-pc!307

src/views/order/deliver/index.vue

@@ -106,10 +106,10 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="info"
+          type="infor"
           plain
           icon="el-icon-upload2"
-          size="mini"
+          size="small"
           @click="handleImport"
           v-hasPermi="['order:deliver:ship']"
         >批量发货