Merge branch 'bf_dev' of git.echepei.com:zhujiawei/Warehouse_management_ui into bf_dev

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -1529,7 +1529,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="毛重(kg)" prop="fGrossweight">
+              <el-form-item label="毛重1(kg)" prop="fGrossweight">
                 <el-input
                     v-model="importList.fGrossweight"
                     v-input-limit="2"