Merge branch 'feature/zs-3.21.00000' into 'teasing/3.21.0'

Feature/zs 3.21.00000

See merge request com.pica.cloud.education.frontend/pica.cloud.web-education-admin!343

src/views/goods/goods-manage.vue

@@ -121,6 +121,7 @@
             <span>{{ scope.row.goodsStatus | rangeStatus }}</span>
           </template>
         </el-table-column>
+        <el-table-column prop="goodsHisStock" label="商品总库存" width="100" align="center"></el-table-column>
         <el-table-column prop="quantityOfSale" label="有效销量" width="120" align="center">
 
         </el-table-column>