Merge branch '20200710_pc_vue_new_branch' into 20200916_pc_vue_new_branch

src/xt_pages/stock/index.vue

           <!--<el-tab-pane label="经销商">-->
             <!--<dealer></dealer>-->
           <!--</el-tab-pane>-->
-          <el-tab-pane label="商品类型">
+          <el-tab-pane label="商品类型" name="first">
             <good-type></good-type>
           </el-tab-pane>
           <!--<el-tab-pane label="商品信息">-->